diff --git a/gridworks b/gridworks
index 0e10145b3..fd861389c 100755
--- a/gridworks
+++ b/gridworks
@@ -316,7 +316,7 @@ windmill_prepare() {
         fi
         
         if [ ! -f "$WINDMILL" ]; then
-            $PYTHON_INSTALL windmill
+            "$PYTHON_INSTALL" windmill
         fi
     fi    
 }
@@ -500,9 +500,9 @@ ui_test() {
     
     echo "Starting Windmill... (press COMMAND-c or CTRL-c to exit)"
     if [ -z "$INTERACTIVE" ]; then
-        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ jsdir=$GRIDWORKS_TEST_DIR/windmill/js > /dev/null
+        "$WINDMILL" firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ jsdir=$GRIDWORKS_TEST_DIR/windmill/js > /dev/null
     else
-        $WINDMILL firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ > /dev/null
+        "$WINDMILL" firefox http://${GRIDWORKS_HOST}:${GRIDWORKS_PORT}/ > /dev/null
     fi
     
     echo ""
@@ -521,7 +521,7 @@ server_test() {
     CLASSPATH="$GRIDWORKS_BUILD_DIR/classes${SEP}$GRIDWORKS_WEBAPP/WEB-INF/classes${SEP}$GRIDWORKS_TEST_DIR/java/classes${SEP}$GRIDWORKS_TEST_DIR/java/lib/*${SEP}$GRIDWORKS_LIB_DIR/*${SEP}$GRIDWORKS_WEBAPP/WEB-INF/lib/*"
 
     if [ -z "$1" ]; then
-        cd $GRIDWORKS_TEST_DIR/java/classes
+        cd "$GRIDWORKS_TEST_DIR/java/classes"
         TESTS=`find . -name '*.class' | sed s@/@.@g | sed s@.class@@ | sed s@..@@`
         cd ../../..
     else