diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 71ad12292..3836548f7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -42,8 +42,8 @@ function(boost_geometry_add_unit_test prefix item)
   target_compile_features(${unit_test_name} PRIVATE cxx_std_14)
 
   # To be able to run ctest
-  if (NOT ("boost_geometry_${prefix}_${item}" STREQUAL "boost_geometry_cs_undefined_setops1") AND
-      NOT ("boost_geometry_${prefix}_${item}" STREQUAL "boost_geometry_cs_undefined_setops2"))
+  set(extra_macro_args ${ARGN})
+  if (NOT extra_macro_args STREQUAL "not_run")
     add_test(NAME ${unit_test_name} COMMAND ${unit_test_name})
   endif()
 
@@ -52,6 +52,7 @@ function(boost_geometry_add_unit_test prefix item)
 
   # Inform the caller about the test name. It can then set defines, if necessary.
   set(BOOST_GEOMETRY_UNIT_TEST_NAME ${unit_test_name} PARENT_SCOPE)
+
 endfunction()
 
 if (NOT TARGET tests)
diff --git a/test/cs_undefined/CMakeLists.txt b/test/cs_undefined/CMakeLists.txt
index f4110499f..88a2dddb2 100644
--- a/test/cs_undefined/CMakeLists.txt
+++ b/test/cs_undefined/CMakeLists.txt
@@ -14,8 +14,9 @@ foreach(item IN ITEMS
     other
     relops1
     relops2
-    setops1
-    setops2
   )
   boost_geometry_add_unit_test("cs_undefined" ${item})
 endforeach()
+
+boost_geometry_add_unit_test("cs_undefined" setops1 "not_run")
+boost_geometry_add_unit_test("cs_undefined" setops2 "not_run")