diff --git a/demos/Makefile.am b/demos/Makefile.am
index ad306562f4..254458d6c5 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,59 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo
-
-INCLUDES = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
-	$(GTK_DEP_LIBS)				\
-	$(MATH_LIB)
-
-noinst_PROGRAMS = 		\
-	testanimation 		\
-	testpixbuf-color	\
-	testpixbuf-save		\
-	testpixbuf-scale 	\
-	pixbuf-demo
-
-testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
-testpixbuf_scale_DEPENDENCIES = $(DEPS)
-testanimation_DEPENDENCIES = $(DEPS)
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
-testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS)
-pixbuf_demo_LDADD = $(LDADDS)
-
-testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c
-testanimation_SOURCES = testanimation.c
-pixbuf_demo_SOURCES = pixbuf-demo.c
-
-EXTRA_DIST +=			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png
+SUBDIRS = gtk-demo pixbuf-demo
 
 -include $(top_srcdir)/git.mk
diff --git a/demos/pixbuf-demo/Makefile.am b/demos/pixbuf-demo/Makefile.am
new file mode 100644
index 0000000000..ca520ce7dc
--- /dev/null
+++ b/demos/pixbuf-demo/Makefile.am
@@ -0,0 +1,41 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
+	$(MATH_LIB)
+
+noinst_PROGRAMS = 		\
+	pixbuf-demo
+
+pixbuf_demo_DEPENDENCIES = $(DEPS)
+
+pixbuf_demo_LDADD = $(LDADDS)
+
+pixbuf_demo_SOURCES = pixbuf-demo.c
+
+EXTRA_DIST +=			\
+	apple-red.png		\
+	background.jpg		\
+	gnome-applets.png	\
+	gnome-calendar.png	\
+	gnome-foot.png		\
+	gnome-gimp.png		\
+	gnome-gmush.png		\
+	gnome-gsame.png		\
+	gnu-keys.png
+
+-include $(top_srcdir)/git.mk
diff --git a/demos/apple-red.png b/demos/pixbuf-demo/apple-red.png
similarity index 100%
rename from demos/apple-red.png
rename to demos/pixbuf-demo/apple-red.png
diff --git a/demos/background.jpg b/demos/pixbuf-demo/background.jpg
similarity index 100%
rename from demos/background.jpg
rename to demos/pixbuf-demo/background.jpg
diff --git a/demos/gnome-applets.png b/demos/pixbuf-demo/gnome-applets.png
similarity index 100%
rename from demos/gnome-applets.png
rename to demos/pixbuf-demo/gnome-applets.png
diff --git a/demos/gnome-calendar.png b/demos/pixbuf-demo/gnome-calendar.png
similarity index 100%
rename from demos/gnome-calendar.png
rename to demos/pixbuf-demo/gnome-calendar.png
diff --git a/demos/gnome-foot.png b/demos/pixbuf-demo/gnome-foot.png
similarity index 100%
rename from demos/gnome-foot.png
rename to demos/pixbuf-demo/gnome-foot.png
diff --git a/demos/gnome-gimp.png b/demos/pixbuf-demo/gnome-gimp.png
similarity index 100%
rename from demos/gnome-gimp.png
rename to demos/pixbuf-demo/gnome-gimp.png
diff --git a/demos/gnome-gmush.png b/demos/pixbuf-demo/gnome-gmush.png
similarity index 100%
rename from demos/gnome-gmush.png
rename to demos/pixbuf-demo/gnome-gmush.png
diff --git a/demos/gnome-gsame.png b/demos/pixbuf-demo/gnome-gsame.png
similarity index 100%
rename from demos/gnome-gsame.png
rename to demos/pixbuf-demo/gnome-gsame.png
diff --git a/demos/gnu-keys.png b/demos/pixbuf-demo/gnu-keys.png
similarity index 100%
rename from demos/gnu-keys.png
rename to demos/pixbuf-demo/gnu-keys.png
diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo/pixbuf-demo.c
similarity index 100%
rename from demos/pixbuf-demo.c
rename to demos/pixbuf-demo/pixbuf-demo.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe077798d9..1d93f3c05e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,7 +89,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testtreecolumns			\
 	testtreecolumnsizing		\
 	testtreesort			\
-	testverticalcells			\
+	testverticalcells		\
 	treestoretest			\
 	testxinerama			\
 	testwindows			\
@@ -110,7 +110,11 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testnoscreen			\
 	testtreepos			\
 	testsensitive			\
-	testtextview
+	testtextview			\
+	testanimation			\
+	testpixbuf-save			\
+	testpixbuf-color		\
+	testpixbuf-scale
 
 if USE_X11
 noinst_PROGRAMS += testerrors
@@ -211,6 +215,10 @@ testnoscreen_DEPENDENCIES = $(TEST_DEPS)
 testtreepos_DEPENDENCIES = $(TEST_DEPS)
 testsensitive_DEPENDENCIES = $(TEST_DEPS)
 testtextview_DEPENDENCIES = $(TEST_DEPS)
+testanimation_DEPENDENCIES = $(TEST_DEPS)
+testpixbuf_save_DEPENDENCIES = $(TEST_DEPS)
+testpixbuf_color_DEPENDENCIES = $(TEST_DEPS)
+testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
 
 flicker_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
@@ -297,6 +305,10 @@ testnoscreen_LDADD = $(LDADDS)
 testtreepos_LDADD = $(LDADDS)
 testsensitive_LDADD = $(LDADDS)
 testtextview_LDADD = $(LDADDS)
+testanimation_LDADD = $(LDADDS)
+testpixbuf_save_LDADD = $(LDADDS)
+testpixbuf_color_LDADD = $(LDADDS)
+testpixbuf_scale_LDADD = $(LDADDS)
 
 
 testentrycompletion_SOURCES = 	\
@@ -444,6 +456,14 @@ testtoplevelembed_SOURCES = testtoplevelembed.c
 
 testtextview_SOURCES = testtextview.c
 
+testanimation_SOURCES = testanimation.c
+
+testpixbuf_scale_SOURCES = testpixbuf-scale.c
+
+testpixbuf_color_SOURCES = testpixbuf-color.c
+
+testpixbuf_save_SOURCES = testpixbuf-save.c
+
 
 EXTRA_DIST += 			\
 	gradient1.png		\
diff --git a/demos/testanimation.c b/tests/testanimation.c
similarity index 100%
rename from demos/testanimation.c
rename to tests/testanimation.c
diff --git a/demos/testpixbuf-color.c b/tests/testpixbuf-color.c
similarity index 100%
rename from demos/testpixbuf-color.c
rename to tests/testpixbuf-color.c
diff --git a/demos/testpixbuf-save.c b/tests/testpixbuf-save.c
similarity index 100%
rename from demos/testpixbuf-save.c
rename to tests/testpixbuf-save.c
diff --git a/demos/testpixbuf-scale.c b/tests/testpixbuf-scale.c
similarity index 100%
rename from demos/testpixbuf-scale.c
rename to tests/testpixbuf-scale.c