diff --git a/moo/t/Makefile.am b/moo/t/Makefile.am
index ff965b8..08073cb 100644
--- a/moo/t/Makefile.am
+++ b/moo/t/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
 
 AM_CPPFLAGS = \
 	-I$(abs_builddir) \
+	-I$(abs_builddir)../lib \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
diff --git a/moo/t/t.h b/moo/t/t.h
index 1b4312a..a69f20c 100644
--- a/moo/t/t.h
+++ b/moo/t/t.h
@@ -3,8 +3,19 @@
 
 #include <stdio.h>
 
-#define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __func__, (int)__LINE__, msg1)
-#define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", __func__, (int)__LINE__, msg1, msg2)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__>=199901L)
+#	define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __func__,
+ (int)__LINE__, msg1)
+#	define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n",
+ __func__, (int)__LINE__, msg1, msg2)
+#else
+#	define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __FILE__,
+ (int)__LINE__, msg1)
+#	define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n",
+ __FILE__, (int)__LINE__, msg1, msg2)
+#endif
+
+
 
 #define T_ASSERT1(test,msg1) do { if (!(test)) { T_ASSERT_FAIL1(msg1); goto oops; } } while(0)
 #define T_ASSERT2(test,msg1,msg2) do { if (!(test)) { T_ASSERT_FAIL2(msg1,msg2); goto oops; } } while(0)