diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 0ac649481..eab0399c1 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -8,20 +8,16 @@ register_source_groups_from_filestructure("${ALL_FILES}" test)
 include_directories(${GTEST_INCLUDE_DIR})
 
 
-configure_file (
-		"${PROJECT_SOURCE_DIR}/src/test/storm-test-config.h.in"
-		"${PROJECT_BINARY_DIR}/src/test/storm-config.h"
-)
-
 foreach (testsuite adapter builder logic modelchecker parser permissiveschedulers solver storage transformer utility)
 
 	  file(GLOB_RECURSE TEST_${testsuite}_FILES ${STORM_CPP_TESTS_BASE_PATH}/${testsuite}/*.h ${STORM_CPP_TESTS_BASE_PATH}/${testsuite}/*.cpp)
-      add_executable (test-${testsuite} ${TEST_${testsuite}_FILES})
+      add_executable (test-${testsuite} ${TEST_${testsuite}_FILES} ${PROJECT_SOURCE_DIR}/src/test/storm-test.cpp)
 	  target_link_libraries(test-${testsuite} storm)
 	  target_link_libraries(test-${testsuite} ${STORM_TEST_LINK_LIBRARIES})
 
 	  add_dependencies(test-${testsuite} test-resources)
 	  add_test(run-test-${testsuite} test-${testsuite})
+	
 endforeach ()
 
 
diff --git a/src/test/storm-test-config.h.in b/src/test/storm-test-config.h.in
deleted file mode 100644
index e69de29bb..000000000