diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6ea366dcc..4f5822ad1 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -134,7 +134,7 @@ libglib_2_0_la_SOURCES = 	\
 	gstdio.c		\
 	gstrfuncs.c		\
 	gstring.c		\
-	gtestframework.c	\
+	gtestutils.c		\
 	gthread.c       	\
 	gthreadprivate.h	\
 	gthreadpool.c   	\
@@ -215,7 +215,7 @@ glibsubinclude_HEADERS =   \
 	gspawn.h	\
 	gstdio.h	\
 	gstrfuncs.h	\
-	gtestframework.h\
+	gtestutils.h	\
 	gstring.h	\
 	gthread.h	\
 	gthreadpool.h	\
diff --git a/glib/glib.h b/glib/glib.h
index dc2bb506d..4a3023781 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -70,7 +70,7 @@
 #include <glib/gspawn.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gstring.h>
-#include <glib/gtestframework.h>
+#include <glib/gtestutils.h>
 #include <glib/gthread.h>
 #include <glib/gthreadpool.h>
 #include <glib/gtimer.h>
diff --git a/glib/glib.symbols b/glib/glib.symbols
index 6214096c8..9288e562d 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1240,8 +1240,8 @@ g_thread_pool_set_sort_function
 #endif
 #endif
 
-#if IN_HEADER(__G_TESTFRAMEWORK_H__)
-#if IN_FILE(__G_TESTFRAMEWORK_C__)
+#if IN_HEADER(__G_TEST_UTILS_H__)
+#if IN_FILE(__G_TEST_UTILS_C__)
 g_assertion_message
 g_assertion_message_cmpnum
 g_assertion_message_cmpstr
diff --git a/glib/gtestframework.c b/glib/gtestutils.c
similarity index 99%
rename from glib/gtestframework.c
rename to glib/gtestutils.c
index 78acd3e18..494aa085b 100644
--- a/glib/gtestframework.c
+++ b/glib/gtestutils.c
@@ -1,4 +1,4 @@
-/* GLib testing framework examples
+/* GLib testing utilities
  * Copyright (C) 2007 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 #include "config.h"
-#include "gtestframework.h"
+#include "gtestutils.h"
 #include "galias.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1700,5 +1700,5 @@ g_test_log_msg_free (GTestLogMsg *tmsg)
  **/
 /* --- macros docs END --- */
 
-#define __G_TESTFRAMEWORK_C__
+#define __G_TEST_UTILS_C__
 #include "galiasdef.c"
diff --git a/glib/gtestframework.h b/glib/gtestutils.h
similarity index 98%
rename from glib/gtestframework.h
rename to glib/gtestutils.h
index 0cc162f11..b57dfd0af 100644
--- a/glib/gtestframework.h
+++ b/glib/gtestutils.h
@@ -1,4 +1,4 @@
-/* GLib testing framework examples
+/* GLib testing utilities
  * Copyright (C) 2007 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -16,8 +16,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#ifndef __G_TESTFRAMEWORK_H__
-#define __G_TESTFRAMEWORK_H__
+#ifndef __G_TEST_UTILS_H__
+#define __G_TEST_UTILS_H__
 
 #include <glib.h>
 
@@ -224,4 +224,4 @@ void            g_test_log_msg_free     (GTestLogMsg    *tmsg);
 
 G_END_DECLS;
 
-#endif /* __G_TESTFRAMEWORK_H__ */
+#endif /* __G_TEST_UTILS_H__ */
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index f1940d051..468cd08e1 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -18,7 +18,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
-#include <glib/gtestframework.h>
+#include <glib/gtestutils.h>
 #include <stdlib.h>
 
 /* test assertion variants */