diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f4b82e60..5a342c529 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -60,7 +60,7 @@ CXX_TEST =
 endif
 
 if ENABLE_TIMELOOP
-timeloop = timeloop timeloop-closure
+timeloop = timeloop
 endif
 noinst_PROGRAMS = $(TEST_PROGS)	\
 	testgdate 		\
@@ -69,8 +69,7 @@ noinst_PROGRAMS = $(TEST_PROGS)	\
 	unicode-collate 	\
 	$(timeloop) 		\
 	assert-msg-test		\
-	datetime		\
-	testgobject
+	datetime
 
 TEST_PROGS		+= testglib
 testglib_SOURCES         = testglib.c
@@ -84,10 +83,8 @@ unicode_collate_LDADD = $(libglib)
 assert_msg_test_LDADD = $(libglib)
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
-timeloop_closure_LDADD = $(libglib) $(libgobject)
 endif
 datetime_LDADD = $(libglib)
-testgobject_LDADD = $(libglib) $(libgobject)
 
 test_programs =					\
 	atomic-test				\
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 7748dd141..e58b1589b 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -70,7 +70,11 @@ performance_programs = 				\
 performance_LDADD = $(libgobject) $(libgthread)
 performance_threaded_LDADD = $(libgobject) $(libgthread)
 check_PROGRAMS = $(test_programs)
-noinst_PROGRAMS = $(performance_programs)
+noinst_PROGRAMS = $(performance_programs) testgobject
+
+if ENABLE_TIMELOOP
+noinst_PROGRAMS += timeloop-closure
+endif
 
 TESTS = $(test_programs) $(performance_programs)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
diff --git a/tests/testgobject.c b/tests/gobject/testgobject.c
similarity index 100%
rename from tests/testgobject.c
rename to tests/gobject/testgobject.c
diff --git a/tests/timeloop-closure.c b/tests/gobject/timeloop-closure.c
similarity index 100%
rename from tests/timeloop-closure.c
rename to tests/gobject/timeloop-closure.c