--- a/tests/tests.h	Sat Mar 16 16:05:37 2013 +0100
+++ b/tests/tests.h	Sat Mar 16 16:23:44 2013 +0100
@@ -67,14 +67,14 @@
 
 /* Define the macro to fail a test with a message */
 #define FAILTEST( message... ){				\
-	fprintf(stderr, ## message);			\
+	TRACE_ERROR(message);				\
 	TRACE_DEBUG(INFO, "Test failed");		\
 	exit(FAIL);					\
 }
 
 /* Define the macro to pass a test */
 #define PASSTEST( ){					\
-	fprintf(stderr, "Test %s passed\n", __FILE__);	\
+	TRACE_NOTICE("Test %s passed\n", __FILE__);	\
 	TRACE_DEBUG(INFO, "Test passed");		\
 	(void)fd_core_shutdown();			\
 	(void)fd_core_wait_shutdown_complete();		\
@@ -89,7 +89,7 @@
 /* Define the standard check routines */
 #define CHECK( _val, _assert ){				\
 	if (test_verbo > 0) {				\
-		fprintf(stderr,				\
+		TRACE_ERROR(				\
 			"%s:%-4d: CHECK( " #_assert " == "\
 				#_val " )\n",		\
 			__FILE__, 			\