diff --git a/cmake/tests.cmake b/cmake/tests.cmake
index 7f597262c82d0..57a004de0aba0 100644
--- a/cmake/tests.cmake
+++ b/cmake/tests.cmake
@@ -39,6 +39,9 @@ if(TARGET test_bitcoin)
       add_test(NAME ${test_suite_name}
         COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no
       )
+      set_property(TEST ${test_suite_name} PROPERTY
+        SKIP_REGULAR_EXPRESSION "no test cases matching filter" "Skipping"
+      )
     endif()
   endfunction()
 
diff --git a/src/test/compilerbug_tests.cpp b/src/test/compilerbug_tests.cpp
index 4492a9686c766..ef558c1e32269 100644
--- a/src/test/compilerbug_tests.cpp
+++ b/src/test/compilerbug_tests.cpp
@@ -6,13 +6,6 @@
 
 BOOST_AUTO_TEST_SUITE(compilerbug_tests)
 
-// At least one test case is required to avoid the "Test setup error: no test
-// cases matching filter or all test cases were disabled" errror.
-BOOST_AUTO_TEST_CASE(dummy)
-{
-    BOOST_CHECK(true);
-}
-
 #if defined(__GNUC__)
 // This block will also be built under clang, which is fine (as it supports noinline)
 void __attribute__ ((noinline)) set_one(unsigned char* ptr)