diff --git a/Makefile.am b/Makefile.am
index 285785fee8..281b67d4f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 9b90e38009..6ee3c05731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1785,6 +1785,8 @@ tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
 tests/visuals/Makefile
+testsuite/Makefile
+testsuite/gdk/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1807,7 +1809,6 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
-gdk/tests/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 379ea28af1..7cdae7d57a 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -9,9 +9,9 @@ INTROSPECTION_COMPILER_ARGS = \
    --includedir=$(srcdir) \
    --includedir=.
 
-SUBDIRS = $(GDK_BACKENDS) . tests
+SUBDIRS = $(GDK_BACKENDS) .
 
-DIST_SUBDIRS = win32 x11 quartz broadway wayland tests
+DIST_SUBDIRS = win32 x11 quartz broadway wayland
 
 CLEANFILES =
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
new file mode 100644
index 0000000000..af7953b92a
--- /dev/null
+++ b/testsuite/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = gdk
+
+-include $(top_srcdir)/git.mk
+
diff --git a/gdk/tests/Makefile.am b/testsuite/gdk/Makefile.am
similarity index 100%
rename from gdk/tests/Makefile.am
rename to testsuite/gdk/Makefile.am
diff --git a/gdk/tests/check-gdk-cairo.c b/testsuite/gdk/check-gdk-cairo.c
similarity index 100%
rename from gdk/tests/check-gdk-cairo.c
rename to testsuite/gdk/check-gdk-cairo.c
diff --git a/gdk/tests/display.c b/testsuite/gdk/display.c
similarity index 100%
rename from gdk/tests/display.c
rename to testsuite/gdk/display.c
diff --git a/gdk/tests/display.test.in b/testsuite/gdk/display.test.in
similarity index 100%
rename from gdk/tests/display.test.in
rename to testsuite/gdk/display.test.in
diff --git a/gdk/tests/encoding.c b/testsuite/gdk/encoding.c
similarity index 100%
rename from gdk/tests/encoding.c
rename to testsuite/gdk/encoding.c
diff --git a/gdk/tests/encoding.test.in b/testsuite/gdk/encoding.test.in
similarity index 100%
rename from gdk/tests/encoding.test.in
rename to testsuite/gdk/encoding.test.in
diff --git a/gdk/tests/keysyms.c b/testsuite/gdk/keysyms.c
similarity index 100%
rename from gdk/tests/keysyms.c
rename to testsuite/gdk/keysyms.c
diff --git a/gdk/tests/keysyms.test.in b/testsuite/gdk/keysyms.test.in
similarity index 100%
rename from gdk/tests/keysyms.test.in
rename to testsuite/gdk/keysyms.test.in
diff --git a/gdk/tests/rgba.c b/testsuite/gdk/rgba.c
similarity index 100%
rename from gdk/tests/rgba.c
rename to testsuite/gdk/rgba.c
diff --git a/gdk/tests/rgba.test.in b/testsuite/gdk/rgba.test.in
similarity index 100%
rename from gdk/tests/rgba.test.in
rename to testsuite/gdk/rgba.test.in