diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 7dbe2345c4..d762a35441 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -59,7 +59,7 @@ accel_SOURCES			 = accel.c
 accel_LDADD			 = $(progs_ldadd)
 
 #TEST_PROGS			+= object
-#object_SOURCES			 = object.c pixbuf-init.c
+#object_SOURCES			 = object.c
 #object_LDADD			 = $(progs_ldadd)
 
 # this doesn't work in make distcheck, since running
@@ -71,7 +71,7 @@ accel_LDADD			 = $(progs_ldadd)
 
 # Should be ported to new API's
 #TEST_PROGS			+= filechooser
-#filechooser_SOURCES		 = filechooser.c pixbuf-init.c
+#filechooser_SOURCES		 = filechooser.c
 #filechooser_LDADD		 = $(progs_ldadd)
 
 TEST_PROGS			+= builder
@@ -81,12 +81,12 @@ builder_LDFLAGS			 = -export-dynamic
 
 if OS_UNIX
 #TEST_PROGS			+= defaultvalue
-#defaultvalue_SOURCES		 = defaultvalue.c pixbuf-init.c
+#defaultvalue_SOURCES		 = defaultvalue.c
 #defaultvalue_LDADD 		 = $(progs_ldadd)
 endif
 
 TEST_PROGS			+= textbuffer
-textbuffer_SOURCES		 = textbuffer.c pixbuf-init.c
+textbuffer_SOURCES		 = textbuffer.c
 textbuffer_LDADD		 = $(progs_ldadd)
 
 TEST_PROGS			+= textiter
diff --git a/gtk/tests/defaultvalue.c b/gtk/tests/defaultvalue.c
index 3d2ff8fa90..ce1ad3b613 100644
--- a/gtk/tests/defaultvalue.c
+++ b/gtk/tests/defaultvalue.c
@@ -321,8 +321,6 @@ test_type (gconstpointer data)
   g_type_class_unref (klass);
 }
 
-extern void pixbuf_init (void);
-
 int
 main (int argc, char **argv)
 {
@@ -330,7 +328,6 @@ main (int argc, char **argv)
   guint i;
 
   gtk_test_init (&argc, &argv);
-  pixbuf_init ();
   gtk_test_register_all_types();
   
   otypes = gtk_test_list_all_types (NULL);
diff --git a/gtk/tests/filechooser.c b/gtk/tests/filechooser.c
index 70af762726..7341e66863 100644
--- a/gtk/tests/filechooser.c
+++ b/gtk/tests/filechooser.c
@@ -1065,13 +1065,10 @@ test_folder_switch_and_filters (void)
   log_test (passed, "test_folder_switch_and_filters(): all filter tests");
 }
 
-extern void pixbuf_init (void);
-
 int
 main (int    argc,
       char **argv)
 {
-  pixbuf_init ();
   /* initialize test program */
   gtk_test_init (&argc, &argv);
 
diff --git a/gtk/tests/object.c b/gtk/tests/object.c
index ff3979ecc0..1e06dede8f 100644
--- a/gtk/tests/object.c
+++ b/gtk/tests/object.c
@@ -304,8 +304,6 @@ widget_property_tests (gconstpointer test_data)
   g_object_unref (widget);
 }
 
-extern void pixbuf_init (void);
-
 /* --- main test program --- */
 int
 main (int   argc,
@@ -314,7 +312,6 @@ main (int   argc,
   const GType *otypes;
   guint i;
   /* initialize test program */
-  pixbuf_init ();
   gtk_test_init (&argc, &argv);
   gtk_test_register_all_types ();
   /* install a property test for each widget type */
diff --git a/gtk/tests/pixbuf-init.c b/gtk/tests/pixbuf-init.c
deleted file mode 100644
index b5ab4f4b19..0000000000
--- a/gtk/tests/pixbuf-init.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "config.h"
-#include <glib.h>
-
-#include <sys/stat.h>
-#include <stdlib.h>
-
-static gboolean
-file_exists (const char *filename)
-{
-  struct stat statbuf;
-
-  return stat (filename, &statbuf) == 0;
-}
-
-void
-pixbuf_init (void)
-{
-  if (file_exists ("../../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
-}
diff --git a/gtk/tests/textbuffer.c b/gtk/tests/textbuffer.c
index c192124b39..e26a5ddfa8 100644
--- a/gtk/tests/textbuffer.c
+++ b/gtk/tests/textbuffer.c
@@ -1319,8 +1319,6 @@ test_tag (void)
   g_object_unref (buffer);
 }
 
-extern void pixbuf_init (void);
-
 int
 main (int argc, char** argv)
 {
@@ -1328,7 +1326,6 @@ main (int argc, char** argv)
   gtk_set_debug_flags (gtk_get_debug_flags () | GTK_DEBUG_TEXT);
 
   gtk_test_init (&argc, &argv);
-  pixbuf_init ();
 
   g_test_add_func ("/TextBuffer/UTF8 unknown char", test_utf8);
   g_test_add_func ("/TextBuffer/Line separator", test_line_separator);