diff --git a/tests/backend/test-threadpool.c b/tests/backend/test-threadpool.c
index 10ee17fe4..4d3074150 100644
--- a/tests/backend/test-threadpool.c
+++ b/tests/backend/test-threadpool.c
@@ -88,7 +88,7 @@ TEST ("threadpool1")
   LumieraThread t1 =
     lumiera_threadpool_acquire_thread(LUMIERA_THREADCLASS_INTERACTIVE,
 				      "test purpose",
-				      &NOBUG_FLAG(test));
+				      &NOBUG_FLAG(TESTS));
   //  lumiera_threadpool_release_thread(t1);
   ECHO("acquired thread 1 %p",t1);
   lumiera_threadpool_destroy();
@@ -104,13 +104,13 @@ TEST ("two-thread-acquire")
   LumieraThread t1 =
     lumiera_threadpool_acquire_thread(LUMIERA_THREADCLASS_INTERACTIVE,
 				      "test purpose",
-				      &NOBUG_FLAG(test));
+				      &NOBUG_FLAG(TESTS));
 
   ECHO("acquiring thread 2");
   LumieraThread t2 =
     lumiera_threadpool_acquire_thread(LUMIERA_THREADCLASS_IDLE,
 				      "test purpose",
-				      &NOBUG_FLAG(test));
+				      &NOBUG_FLAG(TESTS));
 
   ECHO("thread 1 state=%s", lumiera_threadstate_names[t1->state]);
   CHECK(LUMIERA_THREADSTATE_IDLE == t1->state);
@@ -118,13 +118,13 @@ TEST ("two-thread-acquire")
   ECHO("thread 2 state=%s", lumiera_threadstate_names[t2->state]);
   CHECK(LUMIERA_THREADSTATE_IDLE == t2->state);
 
-  LUMIERA_CONDITION_SECTION(cond_sync, &t1->signal)
+  LUMIERA_CONDITION_SECTION(TESTS, &t1->signal)
     {
       t1->state = LUMIERA_THREADSTATE_WAKEUP;
       LUMIERA_CONDITION_SIGNAL;
     }
 
-  LUMIERA_CONDITION_SECTION(cond_sync, &t2->signal)
+  LUMIERA_CONDITION_SECTION(TESTS, &t2->signal)
     {
       t2->state = LUMIERA_THREADSTATE_WAKEUP;
       LUMIERA_CONDITION_SIGNAL;
@@ -152,7 +152,7 @@ TEST ("many-sleepy-threads")
 			       &sleep_fn,
 			       (void *) &delay,
 			       "just sleep a bit",
-			       &NOBUG_FLAG(test));
+			       &NOBUG_FLAG(TESTS));
 	}
     }
 
@@ -177,7 +177,7 @@ TEST ("toomany-random-sleepy-threads (compiletest only)")
 			       &sleep_fn,
 			       (void *) &delay[i],
 			       "just sleep a bit",
-			       &NOBUG_FLAG(test));
+			       &NOBUG_FLAG(TESTS));
 	}
     }
   lumiera_threadpool_destroy();
@@ -193,7 +193,7 @@ TEST ("no-function")
 			  NULL,
 			  NULL,
 			  "process my test function",
-			  &NOBUG_FLAG(test));
+			  &NOBUG_FLAG(TESTS));
 
   // cleanup
   ECHO("finished waiting");
@@ -214,7 +214,7 @@ TEST ("process-function")
 			  &is_prime,
 			  (void *)&number, //void * arg,
 			  "process my test function",
-			  &NOBUG_FLAG(test)); // struct nobug_flag* flag)
+			  &NOBUG_FLAG(TESTS)); // struct nobug_flag* flag)
 
   // cleanup
   lumiera_threadpool_destroy();
@@ -239,7 +239,7 @@ TEST ("many-random-sleepy-threads (compiletest only)")
 			       &sleep_fn,
 			       (void *) &delay[i],
 			       "just sleep a bit",
-			       &NOBUG_FLAG(test));
+			       &NOBUG_FLAG(TESTS));
 	}
     }
   lumiera_threadpool_destroy();
@@ -255,7 +255,7 @@ TEST ("simple-sync")
 					     &other_fn,
 					     (void *)&value,
 					     "other thread",
-					     &NOBUG_FLAG (test));
+					     &NOBUG_FLAG (TESTS));
 
   ECHO ("syncing with the other thread");
   lumiera_thread_sync_other (other);
@@ -279,7 +279,7 @@ TEST ("sync-many")
 				       &sleeping_worker_fn,
 				       (void *)&value,
 				       "worker thread",
-				       &NOBUG_FLAG (test));
+				       &NOBUG_FLAG (TESTS));
       lumiera_thread_sync_other (threads[i]);
     }
   value += 42;
diff --git a/tests/common/test-interfaces.c b/tests/common/test-interfaces.c
index 217459851..61c680cac 100644
--- a/tests/common/test-interfaces.c
+++ b/tests/common/test-interfaces.c
@@ -170,7 +170,7 @@ LumieraInterface
 testacquire_one (LumieraInterface self, LumieraInterface interface)
 {
   (void) interface;
-  TRACE (tests, "Acquire one %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Acquire one %s_%d_%s", self->interface, self->version, self->name);
   one_keeps_two = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_two);
   one_keeps_three = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_three);
   return self;
@@ -179,7 +179,7 @@ testacquire_one (LumieraInterface self, LumieraInterface interface)
 void
 testrelease_one (LumieraInterface self)
 {
-  TRACE (tests, "Release one %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Release one %s_%d_%s", self->interface, self->version, self->name);
   lumiera_interface_close ((LumieraInterface)one_keeps_two);
   lumiera_interface_close ((LumieraInterface)one_keeps_three);
 }
@@ -191,7 +191,7 @@ LumieraInterface
 testacquire_two (LumieraInterface self, LumieraInterface interface)
 {
   (void) interface;
-  TRACE (tests, "Acquire two %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Acquire two %s_%d_%s", self->interface, self->version, self->name);
   two_keeps_one = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_one);
   two_keeps_four = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_four);
   return self;
@@ -200,7 +200,7 @@ testacquire_two (LumieraInterface self, LumieraInterface interface)
 void
 testrelease_two (LumieraInterface self)
 {
-  TRACE (tests, "Release two %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Release two %s_%d_%s", self->interface, self->version, self->name);
   lumiera_interface_close ((LumieraInterface)two_keeps_one);
   lumiera_interface_close ((LumieraInterface)two_keeps_four);
 }
@@ -212,7 +212,7 @@ LumieraInterface
 testacquire_three (LumieraInterface self, LumieraInterface interface)
 {
   (void) interface;
-  TRACE (tests, "Acquire three %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Acquire three %s_%d_%s", self->interface, self->version, self->name);
   three_keeps_two = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_two);
   three_keeps_four = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_four);
   return self;
@@ -221,7 +221,7 @@ testacquire_three (LumieraInterface self, LumieraInterface interface)
 void
 testrelease_three (LumieraInterface self)
 {
-  TRACE (tests, "Release three %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Release three %s_%d_%s", self->interface, self->version, self->name);
   lumiera_interface_close ((LumieraInterface)three_keeps_two);
   lumiera_interface_close ((LumieraInterface)three_keeps_four);
 }
@@ -234,7 +234,7 @@ LumieraInterface
 testacquire_four (LumieraInterface self, LumieraInterface interface)
 {
   (void) interface;
-  TRACE (tests, "Acquire four %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Acquire four %s_%d_%s", self->interface, self->version, self->name);
   four_keeps_one = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_one);
   four_keeps_two = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_two);
   four_keeps_three = LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_three);
@@ -244,7 +244,7 @@ testacquire_four (LumieraInterface self, LumieraInterface interface)
 void
 testrelease_four (LumieraInterface self)
 {
-  TRACE (tests, "Release four %s_%d_%s", self->interface, self->version, self->name);
+  TRACE (TESTS, "Release four %s_%d_%s", self->interface, self->version, self->name);
   lumiera_interface_close ((LumieraInterface)four_keeps_one);
   lumiera_interface_close ((LumieraInterface)four_keeps_two);
   lumiera_interface_close ((LumieraInterface)four_keeps_three);
@@ -351,7 +351,7 @@ TEST ("dependencies_one")
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_one);
   ENSURE (handle);
 
-  TRACE (tests, "Sucessfully opened");
+  TRACE (TESTS, "Sucessfully opened");
 
   lumiera_interface_close ((LumieraInterface)handle);
 
@@ -369,7 +369,7 @@ TEST ("dependencies_two")
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_two);
   ENSURE (handle);
 
-  TRACE (tests, "Sucessfully opened");
+  TRACE (TESTS, "Sucessfully opened");
 
   lumiera_interface_close ((LumieraInterface)handle);
 
@@ -386,7 +386,7 @@ TEST ("dependencies_three")
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_three);
   ENSURE (handle);
 
-  TRACE (tests, "Sucessfully opened");
+  TRACE (TESTS, "Sucessfully opened");
 
   lumiera_interface_close ((LumieraInterface)handle);
 
@@ -404,7 +404,7 @@ TEST ("dependencies_four")
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_four);
   ENSURE (handle);
 
-  TRACE (tests, "Sucessfully opened");
+  TRACE (TESTS, "Sucessfully opened");
 
   lumiera_interface_close ((LumieraInterface)handle);
 
@@ -419,38 +419,38 @@ TEST ("dependencies_all")
   lumiera_interfaceregistry_init ();
   LUMIERA_INTERFACE_REGISTEREXPORTED;
 
-  TRACE (tests, "OPEN one");
+  TRACE (TESTS, "OPEN one");
   LUMIERA_INTERFACE_HANDLE(lumieraorg_testexample_void, 0) handle_one =
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_one);
   ENSURE (handle_one);
 
-  TRACE (tests, "OPEN three");
+  TRACE (TESTS, "OPEN three");
   LUMIERA_INTERFACE_HANDLE(lumieraorg_testexample_void, 0) handle_three =
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_three);
   ENSURE (handle_three);
 
-  TRACE (tests, "OPEN two");
+  TRACE (TESTS, "OPEN two");
   LUMIERA_INTERFACE_HANDLE(lumieraorg_testexample_void, 0) handle_two =
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_two);
   ENSURE (handle_two);
 
-  TRACE (tests, "OPEN four");
+  TRACE (TESTS, "OPEN four");
   LUMIERA_INTERFACE_HANDLE(lumieraorg_testexample_void, 0) handle_four =
     LUMIERA_INTERFACE_OPEN (lumieraorg_testexample_void, 0, 0, lumieraorg_dependencytest_four);
   ENSURE (handle_four);
 
-  TRACE (tests, "Sucessfully OPENED");
+  TRACE (TESTS, "Sucessfully OPENED");
 
-  TRACE (tests, "CLOSE four");
+  TRACE (TESTS, "CLOSE four");
   lumiera_interface_close ((LumieraInterface)handle_four);
 
-  TRACE (tests, "CLOSE two");
+  TRACE (TESTS, "CLOSE two");
   lumiera_interface_close ((LumieraInterface)handle_two);
 
-  TRACE (tests, "CLOSE three");
+  TRACE (TESTS, "CLOSE three");
   lumiera_interface_close ((LumieraInterface)handle_three);
 
-  TRACE (tests, "CLOSE one");
+  TRACE (TESTS, "CLOSE one");
   lumiera_interface_close ((LumieraInterface)handle_one);
 
 
diff --git a/tests/library/test-psplay.c b/tests/library/test-psplay.c
index e7c201159..fbeede525 100644
--- a/tests/library/test-psplay.c
+++ b/tests/library/test-psplay.c
@@ -195,7 +195,7 @@ TEST ("basic_insert_dump")
   for (int i = 1; i <= end; ++i)
     {
       sprintf (key, "%d", i);
-      TRACE (tests, "insert %s", key);
+      TRACE (TESTS, "insert %s", key);
       psplay_insert (&splay_tree, (PSplaynode)testitem_new (key), 100);
     }
 
@@ -205,14 +205,14 @@ TEST ("basic_insert_dump")
   for (int i = 1; i <= end; ++i)
     {
       sprintf (key, "%d", i);
-      TRACE (tests, "insert %s", key);
+      TRACE (TESTS, "insert %s", key);
       psplay_remove_key (&splay_tree, key);
       psplay_dump (&splay_tree, stderr);
     }
   for (int i = end; i; --i)
     {
       sprintf (key, "%d", i);
-      TRACE (tests, "insert %s", key);
+      TRACE (TESTS, "insert %s", key);
       psplay_remove_key (&splay_tree, key);
       psplay_dump (&splay_tree, stderr);
     }
@@ -299,7 +299,7 @@ TEST ("basic_insert_splay")
   for (int i = 1; i <= end; ++i)
     {
       sprintf (key, "%d", i);
-      TRACE (tests, "insert %s", key);
+      TRACE (TESTS, "insert %s", key);
       psplay_insert (&splay_tree, (PSplaynode)testitem_new (key), 100);
     }
 
diff --git a/tests/test.h b/tests/test.h
index 987892956..01374701a 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 
-NOBUG_DEFINE_FLAG (tests);
+NOBUG_DEFINE_FLAG (TESTS);
 LUMIERA_ERROR_DEFINE (TEST, "test error");
 
 #define TESTS_BEGIN                             \
@@ -36,7 +36,7 @@ int                                             \
 main (int argc, const char** argv)              \
 {                                               \
   NOBUG_INIT;                                   \
-  NOBUG_INIT_FLAG (tests);                      \
+  NOBUG_INIT_FLAG (TESTS);                      \
                                                 \
   if (argc == 1)                                \
     {                                           \