#endif
 }
 
+static struct test_case bp_accounting_tests[] = {
+       TEST_CASE("Breakpoint accounting", bp_accounting),
+       { .name = NULL, }
+};
+
 struct test_suite suite__bp_accounting = {
        .desc = "Breakpoint accounting",
-       .func = test__bp_accounting,
+       .test_cases = bp_accounting_tests,
        .is_supported = test__bp_account_is_supported,
 };
 
 #endif
 }
 
+static struct test_case bp_signal_tests[] = {
+       TEST_CASE("Breakpoint overflow signal handler", bp_signal),
+       { .name = NULL, }
+};
+
 struct test_suite suite__bp_signal = {
        .desc = "Breakpoint overflow signal handler",
-       .func = test__bp_signal,
+       .test_cases = bp_signal_tests,
        .is_supported = test__bp_signal_is_supported,
 };
 
        return fails ? TEST_FAIL : TEST_OK;
 }
 
+static struct test_case bp_signal_overflow_tests[] = {
+       TEST_CASE("Breakpoint overflow sampling", bp_signal_overflow),
+       { .name = NULL, }
+};
+
 struct test_suite suite__bp_signal_overflow = {
        .desc = "Breakpoint overflow sampling",
-       .func = test__bp_signal_overflow,
+       .test_cases = bp_signal_overflow_tests,
        .is_supported = test__bp_signal_is_supported,
 };