diff --git a/configure.ac b/configure.ac
index 6ee3c05731..7a0fbbf7ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1787,6 +1787,7 @@ tests/reftests/Makefile
 tests/visuals/Makefile
 testsuite/Makefile
 testsuite/gdk/Makefile
+testsuite/gtk/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1816,7 +1817,6 @@ gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
 gtk/native/Makefile
-gtk/tests/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/engines/Makefile
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 60fbc31e18..a726377f18 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = a11y native . tests
+SUBDIRS = a11y native .
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index af7953b92a..11f7e79c9e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gdk
+SUBDIRS = gdk gtk
 
 -include $(top_srcdir)/git.mk
 
diff --git a/gtk/tests/Makefile.am b/testsuite/gtk/Makefile.am
similarity index 100%
rename from gtk/tests/Makefile.am
rename to testsuite/gtk/Makefile.am
diff --git a/gtk/tests/accel.c b/testsuite/gtk/accel.c
similarity index 100%
rename from gtk/tests/accel.c
rename to testsuite/gtk/accel.c
diff --git a/gtk/tests/accessible.c b/testsuite/gtk/accessible.c
similarity index 100%
rename from gtk/tests/accessible.c
rename to testsuite/gtk/accessible.c
diff --git a/gtk/tests/action.c b/testsuite/gtk/action.c
similarity index 100%
rename from gtk/tests/action.c
rename to testsuite/gtk/action.c
diff --git a/gtk/tests/bitmask.c b/testsuite/gtk/bitmask.c
similarity index 100%
rename from gtk/tests/bitmask.c
rename to testsuite/gtk/bitmask.c
diff --git a/gtk/tests/builder.c b/testsuite/gtk/builder.c
similarity index 100%
rename from gtk/tests/builder.c
rename to testsuite/gtk/builder.c
diff --git a/gtk/tests/cellarea.c b/testsuite/gtk/cellarea.c
similarity index 100%
rename from gtk/tests/cellarea.c
rename to testsuite/gtk/cellarea.c
diff --git a/gtk/tests/crossingevents.c b/testsuite/gtk/crossingevents.c
similarity index 100%
rename from gtk/tests/crossingevents.c
rename to testsuite/gtk/crossingevents.c
diff --git a/gtk/tests/defaultvalue.c b/testsuite/gtk/defaultvalue.c
similarity index 100%
rename from gtk/tests/defaultvalue.c
rename to testsuite/gtk/defaultvalue.c
diff --git a/gtk/tests/entry.c b/testsuite/gtk/entry.c
similarity index 100%
rename from gtk/tests/entry.c
rename to testsuite/gtk/entry.c
diff --git a/gtk/tests/expander.c b/testsuite/gtk/expander.c
similarity index 100%
rename from gtk/tests/expander.c
rename to testsuite/gtk/expander.c
diff --git a/gtk/tests/file-chooser-test-dir/empty b/testsuite/gtk/file-chooser-test-dir/empty
similarity index 100%
rename from gtk/tests/file-chooser-test-dir/empty
rename to testsuite/gtk/file-chooser-test-dir/empty
diff --git a/gtk/tests/file-chooser-test-dir/text.txt b/testsuite/gtk/file-chooser-test-dir/text.txt
similarity index 100%
rename from gtk/tests/file-chooser-test-dir/text.txt
rename to testsuite/gtk/file-chooser-test-dir/text.txt
diff --git a/gtk/tests/filechooser.c b/testsuite/gtk/filechooser.c
similarity index 100%
rename from gtk/tests/filechooser.c
rename to testsuite/gtk/filechooser.c
diff --git a/gtk/tests/filtermodel.c b/testsuite/gtk/filtermodel.c
similarity index 100%
rename from gtk/tests/filtermodel.c
rename to testsuite/gtk/filtermodel.c
diff --git a/gtk/tests/floating.c b/testsuite/gtk/floating.c
similarity index 100%
rename from gtk/tests/floating.c
rename to testsuite/gtk/floating.c
diff --git a/gtk/tests/grid.c b/testsuite/gtk/grid.c
similarity index 100%
rename from gtk/tests/grid.c
rename to testsuite/gtk/grid.c
diff --git a/gtk/tests/gtkmenu.c b/testsuite/gtk/gtkmenu.c
similarity index 100%
rename from gtk/tests/gtkmenu.c
rename to testsuite/gtk/gtkmenu.c
diff --git a/gtk/tests/gtktreemodelrefcount.c b/testsuite/gtk/gtktreemodelrefcount.c
similarity index 100%
rename from gtk/tests/gtktreemodelrefcount.c
rename to testsuite/gtk/gtktreemodelrefcount.c
diff --git a/gtk/tests/gtktreemodelrefcount.h b/testsuite/gtk/gtktreemodelrefcount.h
similarity index 100%
rename from gtk/tests/gtktreemodelrefcount.h
rename to testsuite/gtk/gtktreemodelrefcount.h
diff --git a/gtk/tests/keyhash.c b/testsuite/gtk/keyhash.c
similarity index 100%
rename from gtk/tests/keyhash.c
rename to testsuite/gtk/keyhash.c
diff --git a/gtk/tests/liststore.c b/testsuite/gtk/liststore.c
similarity index 100%
rename from gtk/tests/liststore.c
rename to testsuite/gtk/liststore.c
diff --git a/gtk/tests/modelrefcount.c b/testsuite/gtk/modelrefcount.c
similarity index 100%
rename from gtk/tests/modelrefcount.c
rename to testsuite/gtk/modelrefcount.c
diff --git a/gtk/tests/object.c b/testsuite/gtk/object.c
similarity index 100%
rename from gtk/tests/object.c
rename to testsuite/gtk/object.c
diff --git a/gtk/tests/objects-finalize.c b/testsuite/gtk/objects-finalize.c
similarity index 100%
rename from gtk/tests/objects-finalize.c
rename to testsuite/gtk/objects-finalize.c
diff --git a/gtk/tests/papersize.c b/testsuite/gtk/papersize.c
similarity index 100%
rename from gtk/tests/papersize.c
rename to testsuite/gtk/papersize.c
diff --git a/gtk/tests/rbtree.c b/testsuite/gtk/rbtree.c
similarity index 100%
rename from gtk/tests/rbtree.c
rename to testsuite/gtk/rbtree.c
diff --git a/gtk/tests/recentmanager.c b/testsuite/gtk/recentmanager.c
similarity index 100%
rename from gtk/tests/recentmanager.c
rename to testsuite/gtk/recentmanager.c
diff --git a/gtk/tests/regression-tests.c b/testsuite/gtk/regression-tests.c
similarity index 100%
rename from gtk/tests/regression-tests.c
rename to testsuite/gtk/regression-tests.c
diff --git a/gtk/tests/sortmodel.c b/testsuite/gtk/sortmodel.c
similarity index 100%
rename from gtk/tests/sortmodel.c
rename to testsuite/gtk/sortmodel.c
diff --git a/gtk/tests/stylecontext.c b/testsuite/gtk/stylecontext.c
similarity index 100%
rename from gtk/tests/stylecontext.c
rename to testsuite/gtk/stylecontext.c
diff --git a/gtk/tests/templates.c b/testsuite/gtk/templates.c
similarity index 100%
rename from gtk/tests/templates.c
rename to testsuite/gtk/templates.c
diff --git a/gtk/tests/testing.c b/testsuite/gtk/testing.c
similarity index 100%
rename from gtk/tests/testing.c
rename to testsuite/gtk/testing.c
diff --git a/gtk/tests/textbuffer.c b/testsuite/gtk/textbuffer.c
similarity index 100%
rename from gtk/tests/textbuffer.c
rename to testsuite/gtk/textbuffer.c
diff --git a/gtk/tests/textiter.c b/testsuite/gtk/textiter.c
similarity index 100%
rename from gtk/tests/textiter.c
rename to testsuite/gtk/textiter.c
diff --git a/gtk/tests/treemodel.c b/testsuite/gtk/treemodel.c
similarity index 100%
rename from gtk/tests/treemodel.c
rename to testsuite/gtk/treemodel.c
diff --git a/gtk/tests/treemodel.h b/testsuite/gtk/treemodel.h
similarity index 100%
rename from gtk/tests/treemodel.h
rename to testsuite/gtk/treemodel.h
diff --git a/gtk/tests/treepath.c b/testsuite/gtk/treepath.c
similarity index 100%
rename from gtk/tests/treepath.c
rename to testsuite/gtk/treepath.c
diff --git a/gtk/tests/treestore.c b/testsuite/gtk/treestore.c
similarity index 100%
rename from gtk/tests/treestore.c
rename to testsuite/gtk/treestore.c
diff --git a/gtk/tests/treeview-scrolling.c b/testsuite/gtk/treeview-scrolling.c
similarity index 100%
rename from gtk/tests/treeview-scrolling.c
rename to testsuite/gtk/treeview-scrolling.c
diff --git a/gtk/tests/treeview.c b/testsuite/gtk/treeview.c
similarity index 100%
rename from gtk/tests/treeview.c
rename to testsuite/gtk/treeview.c
diff --git a/gtk/tests/window.c b/testsuite/gtk/window.c
similarity index 100%
rename from gtk/tests/window.c
rename to testsuite/gtk/window.c