diff --git a/.travis.yml b/.travis.yml
index 6764ff9953bfad28887e26461d6e85201c735a4b..5bf82b7eec6c74a087df9366d394215bbdade62e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,11 +61,11 @@ install:
     fi
 
 before_script:
-  - git clone https://github.com/jreybert/djooks
+  - git clone https://github.com/jreybert/djooks "djooks with spaces"
   - git clone https://github.com/jreybert/vader.vim
 
 script:
-  - ./test/run.sh . vader.vim djooks $VIM_VERSION
+  - ./test/run.sh . vader.vim "djooks with spaces" $VIM_VERSION
 
 after_success:
   - ./test/merge.sh
diff --git a/test/run.sh b/test/run.sh
index 8a4e37488bb8f494bb6873c8744dfa89a8744ce7..47bd3d2b9339acffebd33cfa672bd06146b82d8c 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -15,7 +15,7 @@ python -c "import os,sys; print(os.path.realpath(os.path.expanduser(sys.argv[1])
 
 export VIMAGIT_PATH=$(prealpath $1)
 export VADER_PATH=$(prealpath $2)
-export TEST_PATH=$(prealpath $3)
+export TEST_PATH=$(prealpath "$3")
 export VIM_VERSION=$4
 
 if [[ ! ( -d $VIMAGIT_PATH && -d $VADER_PATH && -d $TEST_PATH ) ]]; then
@@ -23,7 +23,7 @@ if [[ ! ( -d $VIMAGIT_PATH && -d $VADER_PATH && -d $TEST_PATH ) ]]; then
 	exit 1
 fi
 
-pushd $TEST_PATH
+pushd "$TEST_PATH"
 git config --local user.email 'tester@vimagit.org'
 git config --local user.name 'vimagit tester'
 export TEST_HEAD_SHA1='origin/vimagit_test-1.4.1'
@@ -62,7 +62,7 @@ for script in ${!test_scripts[@]}; do
 	for filename in "${filename_array[@]}"; do
 		echo ${_TEST_PATHS[@]}
 		for test_path in ${_TEST_PATHS[@]}; do
-			export TEST_SUB_PATH=$(prealpath $TEST_PATH/$test_path)
+			export TEST_SUB_PATH=$(prealpath "$TEST_PATH"/$test_path)
 			export VIMAGIT_TEST_FILENAME="$filename"
 
 			for i in $EOL_TEST; do