#ifdef HAVE_AUXTRACE_SUPPORT
 DEFINE_SUITE("x86 instruction decoder - new instructions", insn_x86);
-DEFINE_SUITE("Intel PT packet decoder", intel_pt_pkt_decoder);
+
+static struct test_case intel_pt_tests[] = {
+       TEST_CASE("Intel PT packet decoder", intel_pt_pkt_decoder),
+       { .name = NULL, }
+};
+
+struct test_suite suite__intel_pt = {
+       .desc = "Intel PT packet decoder",
+       .test_cases = intel_pt_tests,
+};
+
 #endif
 #if defined(__x86_64__)
 DEFINE_SUITE("x86 bp modify", bp_modify);
 #endif
 #ifdef HAVE_AUXTRACE_SUPPORT
        &suite__insn_x86,
-       &suite__intel_pt_pkt_decoder,
+       &suite__intel_pt,
 #endif
 #if defined(__x86_64__)
        &suite__bp_modify,