diff --git a/tests/install.sh b/tests/install.sh
index de74e21f..974971a5 100755
--- a/tests/install.sh
+++ b/tests/install.sh
@@ -19,6 +19,7 @@ if test -n "$USE_UCS2_PYTHON" ; then
 	set +e
 	mkvirtualenv -p "$PYTHON" cpython-ucs2-$UCS2_PYTHON_VARIANT
 	set -e
+	. tests/bot-ci/scripts/common/main.sh
 	pip install .
 	if test "$UCS2_PYTHON_VARIANT" = "2.6" ; then
 		rm tests/bot-ci/deps/wheels/ucs2-CPython-${UCS2_PYTHON_VARIANT}*/pyuv*.whl
@@ -33,10 +34,10 @@ else
 		rm tests/bot-ci/deps/wheels/$PYTHON_SUFFIX/pyuv*.whl
 	fi
 	pip install --no-deps tests/bot-ci/deps/wheels/$PYTHON_SUFFIX/*.whl
-	if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
-		archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_VERSION}.tar.gz"
-		sudo sh -c "cd /opt && tar xzf $archive"
-	fi
+fi
+if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
+	archive="${PWD:-$(pwd)}/tests/bot-ci/deps/zpython/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}.tar.gz"
+	sudo sh -c "cd /opt && tar xzf $archive"
 fi
 
 archive="${PWD:-$(pwd)}/tests/bot-ci/deps/fish/fish.tar.gz"
diff --git a/tests/run_vim_tests.sh b/tests/run_vim_tests.sh
index 54612e53..5fdc3975 100755
--- a/tests/run_vim_tests.sh
+++ b/tests/run_vim_tests.sh
@@ -4,7 +4,8 @@ FAILED=0
 
 if test -z "$VIM" ; then
 	if test -n "$USE_UCS2_PYTHON" ; then
-		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-double/vim"
+		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$UCS2_PYTHON_VARIANT-ucs2-double/vim"
+		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$UCS2_PYTHON_VARIANT-ucs2/vim"
 		opt_dir="/opt/cpython-ucs2-$UCS2_PYTHON_VARIANT"
 		main_path="$opt_dir/lib/python$UCS2_PYTHON_VARIANT"
 		site_path="$main_path/site-packages"
@@ -16,8 +17,8 @@ if test -z "$VIM" ; then
 		if test "$PYTHON_IMPLEMENTATION" != "CPython" ; then
 			exit 0
 		fi
-		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$PYTHON_VERSION/vim"
-		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_VERSION/vim"
+		NEW_VIM="$ROOT/tests/bot-ci/deps/vim/tip-$PYTHON_MM/vim"
+		OLD_VIM="$ROOT/tests/bot-ci/deps/vim/v7-0-112-$PYTHON_MM/vim"
 		if test -e "$OLD_VIM" ; then
 			VIMS="NEW_VIM OLD_VIM"
 		else
diff --git a/tests/test.sh b/tests/test.sh
index 01ca51c5..62b525df 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -6,7 +6,7 @@ FAILED=0
 export PATH="/opt/fish/bin:${PATH}"
 
 if test "$PYTHON_IMPLEMENTATION" = "CPython" ; then
-	export PATH="/opt/zsh-${PYTHON_VERSION}/bin:${PATH}"
+	export PATH="/opt/zsh-${PYTHON_MM}${USE_UCS2_PYTHON:+-ucs2}/bin:${PATH}"
 fi
 
 if test -n "$USE_UCS2_PYTHON" ; then