--- a/src/test/traced/traced-callback-typedef-test-suite.cc	Sat Aug 22 17:06:25 2015 +0200
+++ b/src/test/traced/traced-callback-typedef-test-suite.cc	Sun Aug 23 16:06:17 2015 -0700
@@ -632,16 +632,16 @@
          empty, empty, empty);
 }
 
-class TracedCallbackTestSuite : public TestSuite
+class TracedCallbackTypedefTestSuite : public TestSuite
 {
 public:
-  TracedCallbackTestSuite ();
+  TracedCallbackTypedefTestSuite ();
 };
 
-TracedCallbackTestSuite::TracedCallbackTestSuite ()
-  : TestSuite ("traced-callback", UNIT)
+TracedCallbackTypedefTestSuite::TracedCallbackTypedefTestSuite ()
+  : TestSuite ("traced-callback-typedef", SYSTEM)
 {
   AddTestCase (new TracedCallbackTypedefTestCase, TestCase::QUICK);
 }
 
-static TracedCallbackTestSuite tracedCallbackTestSuite;
+static TracedCallbackTypedefTestSuite tracedCallbackTypedefTestSuite;

--- a/src/test/traced/traced-value-callback-typedef-test-suite.cc	Sat Aug 22 17:06:25 2015 +0200
+++ b/src/test/traced/traced-value-callback-typedef-test-suite.cc	Sun Aug 23 16:06:17 2015 -0700
@@ -232,7 +232,7 @@
 };
 
 TracedValueCallbackTestSuite::TracedValueCallbackTestSuite ()
-  : TestSuite ("tracedvalue-callback", UNIT)
+  : TestSuite ("traced-value-callback", UNIT)
 {
   AddTestCase (new TracedValueCallbackTestCase, TestCase::QUICK);
 }