diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c3727368..66dff373c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ endif(TOLUA_FOUND)
 
 enable_testing()
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 add_subdirectory (tolua)
 add_subdirectory (tools)
 add_subdirectory (storage)
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 560e1e737..86bd79aaa 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -1,14 +1,14 @@
 @ECHO OFF
-IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\eressea\Debug
-IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\eressea\Debug
-IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\eressea\Debug
-IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\eressea\Debug
-IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\eressea\Debug
-IF EXIST ..\build-vs16 SET BUILD=..\build-vs16\eressea\Debug
+IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\Debug
+IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\\Debug
+IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\Debug
+IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\Debug
+IF EXIST ..\build-vs15 SET BUILD=..\build-vs15\Debug
+IF EXIST ..\build-vs16 SET BUILD=..\build-vs16\Debug
 
 SET SERVER=%BUILD%\eressea.exe
 %BUILD%\test_eressea.exe
-SET LUA_PATH=..\share\lua\5.4\?.lua;;
+REM SET LUA_PATH=..\share\lua\5.4\?.lua;;
 
 %SERVER% -v1 ..\scripts\run-tests.lua
 %SERVER% -v1 -re2 ..\scripts\run-tests-e2.lua