diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb424e745..ae0274f6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,9 +229,6 @@ if (NOT JUSTTESTS)
 
 endif()
 
-enable_testing()
-add_test(NAME alltests WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test COMMAND testeth)
-
 #unset(TARGET_PLATFORM CACHE)
 
 if (WIN32)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ef292c2bb..47dc611a5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,6 +16,21 @@ include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 
+# search for test names and create ctest tests
+enable_testing()
+foreach(file ${SRC_LIST})
+	file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/${file} test_list_raw REGEX "BOOST_.*TEST_(SUITE|CASE)")
+	set(TestSuite "DEFAULT")
+	foreach(test_raw ${test_list_raw})
+		string(REGEX REPLACE ".*TEST_(SUITE|CASE)\\(([^ ,\\)]*).*" "\\1 \\2" test ${test_raw})
+		if(test MATCHES "^SUITE .*")
+			string(SUBSTRING ${test} 6 -1 TestSuite)
+		elseif(test MATCHES "^CASE .*")
+			string(SUBSTRING ${test} 5 -1 TestCase)
+			add_test(NAME ${TestSuite}/${TestCase} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test COMMAND testeth -t ${TestSuite}/${TestCase})
+		endif(test MATCHES "^SUITE .*")
+	endforeach(test_raw)
+endforeach(file)
 
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})