diff --git a/Makefile.am b/Makefile.am
index d663e61891..4489fc93ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,19 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-SUBDIRS = 		\
+if BUILD_TESTS
+SUBDIRS_TESTS = tests
+else
+SUBDIRS_TESTS =
+endif
+
+SUBDIRS = \
 	gst \
 	common \
 	pkgconfig \
 	docs \
 	$(SUBDIRS_EXAMPLES) \
-	tests
+	$(SUBDIRS_TESTS)
 
 DIST_SUBDIRS = gst common pkgconfig docs examples tests
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ca2ba661e8..f653107024 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,14 +6,6 @@ AM_LDFLAGS = \
 	$(GST_LIBS) \
 	$(top_builddir)/gst/rtsp-server/libgstrtspserver-@GST_API_VERSION@.la
 
-if BUILD_TESTS
-SUBDIRS_CHECK = check
-else
-SUBDIRS_CHECK =
-endif
+SUBDIRS = check
 
-SUBDIRS = 			\
-	$(SUBDIRS_CHECK)
-
-DIST_SUBDIRS = 			\
-	check
+DIST_SUBDIRS = check