diff --git a/.vim.local/scripts/vimmake.test b/.vim.local/scripts/vimmake.test
index ea3098d..6fd5e37 100755
--- a/.vim.local/scripts/vimmake.test
+++ b/.vim.local/scripts/vimmake.test
@@ -1,14 +1,14 @@
 #!/bin/bash
 if make -j 8 all CONFIG=.vim.local/scripts/build-config; then
 	if [ "$VIM_RELDIR" = "tests" ] && [ "$VIM_FILEEXT" = ".cc" ]; then
-		if [ -f "output/fast/test-$VIM_FILENOEXT" ]; then
-			LD_LIBRARY_PATH=./output \
-			./output/test-$VIM_FILENOEXT 2>&1 \
+		if [ -f "output/linux/test-$VIM_FILENOEXT" ]; then
+			LD_LIBRARY_PATH=./output/linux:./output/linux/cppunit/lib \
+			./output/linux/test-$VIM_FILENOEXT 2>&1 \
 				| sed -e s/"$VIM_FILENAME"/'tests\/'"$VIM_FILENAME"/g
 			exit 0
 		fi
 	fi
-	LD_LIBRARY_PATH=./output \
-	./output/run-all-tests 2>&1 \
+	LD_LIBRARY_PATH=./output/linux:./output/linux/cppunit/lib \
+	./output/linux/run-all-tests 2>&1 \
 		| sed -e 's/^\([a-z\-]\+\.cc\)/tests\/\1/g'
 fi