diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9c2fb4d..46cf8269 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,3 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 ADD_DEFINITIONS(-O3 -g)
 
 ADD_SUBDIRECTORY(test)
-
-ENABLE_TESTING()
-if(NOT MSVC)
-	ADD_TEST(NAME ./test/test.run COMMAND ./test/test.run)
-	ADD_TEST(NAME ./load_test COMMAND ./load_test)
-endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e5345c5b..e4d74529 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,7 @@
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 
+ENABLE_TESTING()
 ADD_EXECUTABLE(load_test load_test.cpp)
 ADD_SUBDIRECTORY(unittest)
+ADD_TEST(NAME ./test/test.run COMMAND ./test/test.run)
+ADD_TEST(NAME ./load_test COMMAND ./load_test)