diff --git a/configure.ac b/configure.ac
index 649fbaaa9b..75761d5322 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1748,6 +1748,7 @@ demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
+demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
 tests/a11y/Makefile
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 254458d6c5..85bf0b4e67 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo pixbuf-demo
+SUBDIRS = gtk-demo widget-factory pixbuf-demo
 
 -include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
new file mode 100644
index 0000000000..93bb927230
--- /dev/null
+++ b/demos/widget-factory/Makefile.am
@@ -0,0 +1,20 @@
+include $(top_srcdir)/Makefile.decl
+
+bin_PROGRAMS = gtk3-widget-factory
+
+gtk3_widget_factory_SOURCES = \
+	widget-factory.c
+
+gtk3_widget_factory_DEPENDENCIES = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+gtk3_widget_factory_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+gtk3_widget_factory_LDADD = \
+	$(top_builddir)/gdk/libgdk-3.la \
+	$(top_builddir)/gtk/libgtk-3.la
+
+EXTRA_DIST += widget-factory.ui
diff --git a/tests/widget-factory.c b/demos/widget-factory/widget-factory.c
similarity index 100%
rename from tests/widget-factory.c
rename to demos/widget-factory/widget-factory.c
diff --git a/tests/widget-factory.ui b/demos/widget-factory/widget-factory.ui
similarity index 100%
rename from tests/widget-factory.ui
rename to demos/widget-factory/widget-factory.ui
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9652b41ff2..6c1c1d854e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -121,7 +121,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testpixbuf-save			\
 	testpixbuf-color		\
 	testpixbuf-scale		\
-	widget-factory 			\
 	testgmenu			\
 	testlogout
 
@@ -238,7 +237,6 @@ testanimation_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_save_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_color_DEPENDENCIES = $(TEST_DEPS)
 testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
-widget_factory_DEPENDENCIES = $(TEST_DEPS)
 testgmenu_DEPENDENCIES = $(TEST_DEPS)
 testlogout_DEPENDENCIES = $(TEST_DEPS)
 
@@ -339,7 +337,6 @@ testanimation_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
 testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
-widget_factory_LDADD = $(LDADDS)
 testgmenu_LDADD = $(LDADDS)
 testlogout_LDADD = $(LDADDS)
 
@@ -522,8 +519,6 @@ testpixbuf_color_SOURCES = testpixbuf-color.c
 
 testpixbuf_save_SOURCES = testpixbuf-save.c
 
-widget_factory_SOURCES = widget-factory.c
-
 
 EXTRA_DIST += 			\
 	gradient1.png		\
@@ -545,8 +540,7 @@ EXTRA_DIST += 			\
 	merge-2.ui		\
 	merge-3.ui		\
 	gnome-textfile.png	\
-	makefile.msc		\
-	widget-factory.ui
+	makefile.msc
 
 
 -include $(top_srcdir)/git.mk