diff --git a/game-e2/eressea.ini b/game-e2/eressea.ini
index 8e4eff430..f92fcd87e 100644
--- a/game-e2/eressea.ini
+++ b/game-e2/eressea.ini
@@ -1,6 +1,5 @@
 [eressea]
 base = .
-load = setup.lua
 report = reports
 verbose = 0
 lomem = 0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0aacc8d76..fde5e11f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -152,7 +152,15 @@ target_link_libraries(test_eressea
   )
 
 add_test(server test_eressea)
-add_test(NAME E3 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/game-e3 COMMAND $<TARGET_FILE:eressea> -e run_tests)
-add_test(NAME E2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/game-e2 COMMAND $<TARGET_FILE:eressea> -e run_tests)
+add_test(
+	NAME E3
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/game-e3
+  COMMAND $<TARGET_FILE:eressea> runtests.lua
+	)
+add_test(
+	NAME E2
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/game-e2
+  COMMAND $<TARGET_FILE:eressea> runtests.lua
+  )
 
 install(TARGETS eressea DESTINATION bin)