diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@
 add_custom_target(check)
 add_custom_target(check-extended)
 add_custom_target(check-upgrade-activated)
+add_custom_target(check-upgrade-activated-extended)
 add_custom_target(check-symbols)
 add_custom_target(check-security)
 
diff --git a/cmake/modules/TestSuite.cmake b/cmake/modules/TestSuite.cmake
--- a/cmake/modules/TestSuite.cmake
+++ b/cmake/modules/TestSuite.cmake
@@ -72,6 +72,7 @@
 			create_test_suite_with_parent_targets(
 				${SUITE_UPGRADE_ACTIVATED}
 				check-upgrade-activated
+				check-upgrade-activated-extended
 			)
 			add_dependencies(${TARGET_UPGRADE_ACTIVATED} ${NAME})
 		endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -78,11 +78,12 @@
 )
 add_dependencies(check-upgrade-activated check-functional-upgrade-activated)
 
-add_functional_test_check(check-functional-extended-upgrade-activated
+add_functional_test_check(check-functional-upgrade-activated-extended
 	"Run the extended functional tests with the upgrade activated"
 	--extended
 	--with-phononactivation
 )
+add_dependencies(check-upgrade-activated-extended check-functional-upgrade-activated-extended)
 
 if(BUILD_BITCOIN_TX)
 	add_custom_target(check-bitcoin-util