diff --git a/CMakeSettings.json b/CMakeSettings.json
index 934963e60..8bf3c23fc 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -1,11 +1,11 @@
-{
+{
   "configurations": [
     {
       "name": "x64-Debug",
       "generator": "Ninja",
       "configurationType": "Debug",
       "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",
@@ -36,4 +36,4 @@
       "variables": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 5925f07e3..c8b4ec03b 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -1,11 +1,4 @@
 @ECHO OFF
-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
-IF EXIST ..\out\build\x86-Debug\eressea.exe SET BUILD=..\out\build\x86-Debug
 IF EXIST ..\out\build\x64-Debug\eressea.exe SET BUILD=..\out\build\x64-Debug
 
 SET SERVER=%BUILD%\eressea.exe