diff --git a/configure.ac b/configure.ac
index be1bed65d4..b23f0634e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,6 @@ testsuite/Makefile
 testsuite/bins/Makefile
 testsuite/bytestream/Makefile
 testsuite/caps/Makefile
-testsuite/caps2/Makefile
 testsuite/cleanup/Makefile
 testsuite/clock/Makefile
 testsuite/debug/Makefile
diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am
index 8755521f2a..5821204fa6 100644
--- a/tests/old/testsuite/Makefile.am
+++ b/tests/old/testsuite/Makefile.am
@@ -14,7 +14,7 @@ GST_DEBUG_DIRS = debug
 endif
 
 SUBDIRS = bins bytestream cleanup dynparams \
-	caps caps2 plugin elements clock refcounting tags threads \
+	caps plugin elements clock refcounting tags threads \
 	indexers debug $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS)
 
 DIST_SUBDIRS = bins bytestream caps caps2 cleanup clock dynparams elements indexers \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 8755521f2a..5821204fa6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -14,7 +14,7 @@ GST_DEBUG_DIRS = debug
 endif
 
 SUBDIRS = bins bytestream cleanup dynparams \
-	caps caps2 plugin elements clock refcounting tags threads \
+	caps plugin elements clock refcounting tags threads \
 	indexers debug $(GST_PARSE_DIRS) $(GST_DEBUG_DIRS)
 
 DIST_SUBDIRS = bins bytestream caps caps2 cleanup clock dynparams elements indexers \