diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake
--- a/cmake/modules/TestSuite.cmake
+++ b/cmake/modules/TestSuite.cmake
@@ -59,6 +59,14 @@
 			${_test_name}
 			${NAME} -t "${_test_name}"
 		)
+		if(TEST_WITH_UPGRADE_ACTIVATED)
+			_add_test_runner(
+				${SUITE}
+				"${_test_name}-upgrade-activated"
+				${NAME} -t "${_test_name}"
+				-- -gravitonactivationtime=1573819200
+			)
+		endif()
 	endforeach()
 
 	find_package(Boost 1.58 REQUIRED unit_test_framework)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -156,17 +156,6 @@
 		../rpc/test/server_tests.cpp
 )
 
-if (TEST_WITH_UPGRADE_ACTIVATED)
-	add_test(
-		NAME
-			"bitcoin-upgrade-activated"
-		COMMAND
-			"test_bitcoin"
-			"--"
-			"-gravitonactivationtime=1573819200"
-	)
-endif()
-
 target_link_libraries(test_bitcoin rpcclient server)
 if(TARGET bitcoinconsensus-shared)
 	target_link_libraries(test_bitcoin bitcoinconsensus-shared)