diff --git a/configure.in b/configure.in
index 9472c2c33..fb6f19f5f 100644
--- a/configure.in
+++ b/configure.in
@@ -2974,6 +2974,7 @@ glib/libcharset/Makefile
 glib/gnulib/Makefile
 glib/pcre/Makefile
 glib/update-pcre/Makefile
+glib/tests/Makefile
 gmodule/Makefile
 gmodule/gmoduleconf.h
 gobject/Makefile
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 766b2da09..068fec467 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -134,6 +134,7 @@ libglib_2_0_la_SOURCES = 	\
 	gstdio.c		\
 	gstrfuncs.c		\
 	gstring.c		\
+	gtestframework.c	\
 	gthread.c       	\
 	gthreadprivate.h	\
 	gthreadpool.c   	\
@@ -214,6 +215,7 @@ glibsubinclude_HEADERS =   \
 	gspawn.h	\
 	gstdio.h	\
 	gstrfuncs.h	\
+	gtestframework.h\
 	gstring.h	\
 	gthread.h	\
 	gthreadpool.h	\
diff --git a/glib/glib.h b/glib/glib.h
index b45d3b708..dc2bb506d 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -70,6 +70,7 @@
 #include <glib/gspawn.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gstring.h>
+#include <glib/gtestframework.h>
 #include <glib/gthread.h>
 #include <glib/gthreadpool.h>
 #include <glib/gtimer.h>
diff --git a/glib/gtestframework.c b/glib/gtestframework.c
new file mode 100644
index 000000000..33e31f88d
--- /dev/null
+++ b/glib/gtestframework.c
@@ -0,0 +1,18 @@
+/* GLib testing framework examples
+ * Copyright (C) 2007 Tim Janik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
diff --git a/glib/gtestframework.h b/glib/gtestframework.h
new file mode 100644
index 000000000..33e31f88d
--- /dev/null
+++ b/glib/gtestframework.h
@@ -0,0 +1,18 @@
+/* GLib testing framework examples
+ * Copyright (C) 2007 Tim Janik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
new file mode 100644
index 000000000..e69de29bb