diff --git a/configure.ac b/configure.ac
index 6298456c..146c3c68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,14 +836,6 @@ lasso/xml/id-wsf-2.0/Makefile
 lasso/xml/ws/Makefile
 tests/Makefile
 tests/data/Makefile
-tests/data/ca1-la/Makefile
-tests/data/idp1-la/Makefile
-tests/data/lecp1-la/Makefile
-tests/data/sp1-la/Makefile
-tests/data/idp5-saml2/Makefile
-tests/data/sp5-saml2/Makefile
-tests/data/sp6-saml2/Makefile
-tests/metadata/Makefile
 lasso.pc
 win32/Makefile
 win32/lasso.rc
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d1f6f4a..20b408b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,9 +41,9 @@ perfs_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
 perfs_LDFLAGS = -rpath `cd $(top_builddir)/lasso/.libs/; pwd`
 
 endif
-EXTRA_DIST = valgrind tests.h $(tests_SOURCES)
+EXTRA_DIST = metadata valgrind tests.h $(tests_SOURCES)
 
-SUBDIRS = data metadata
+SUBDIRS = data
 
 CLEANFILES = result.xml
 
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e3e7c152..4ee98bba 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1,4 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = ca1-la idp1-la lecp1-la sp1-la idp5-saml2 sp5-saml2 sp6-saml2
 
-EXTRA_DIST = sample-identity-dump-1.xml response-1 response-2 response-3 response-4 sp2-la
+EXTRA_DIST = sample-identity-dump-1.xml ca1-la ca1-ssl ca2-la ca2-ssl ca3-la ca3-ssl ca4-la ca4-ssl \
+	     idp1-la idp1-ssl idp2-la idp2-ssl idp3-la idp3-ssl idp4-la idp4-ssl idp5-saml2 idp6-saml2 idp7-saml2 \
+	     lecp1-la lecp1-ssl lecp2-la lecp2-ssl lecp3-la lecp3-ssl lecp4-la lecp4-ssl \
+	     sp1-la sp1-ssl sp2-la sp2-ssl sp3-la sp3-ssl sp4-la sp4-ssl sp5-saml2 sp6-saml2 sp7-saml2 \
+	     user1-la user2-la user3-la user4-la
diff --git a/tests/data/ca1-la/Makefile.am b/tests/data/ca1-la/Makefile.am
deleted file mode 100644
index 344664f1..00000000
--- a/tests/data/ca1-la/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = certificate.pem jks.keystore
diff --git a/tests/data/idp1-la/Makefile.am b/tests/data/idp1-la/Makefile.am
deleted file mode 100644
index 45782b12..00000000
--- a/tests/data/idp1-la/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem
diff --git a/tests/data/idp5-saml2/Makefile.am b/tests/data/idp5-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/idp5-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/data/idp6-saml2/Makefile.am b/tests/data/idp6-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/idp6-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/data/idp7-saml2/Makefile.am b/tests/data/idp7-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/idp7-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/data/lecp1-la/Makefile.am b/tests/data/lecp1-la/Makefile.am
deleted file mode 100644
index 2cc7eacb..00000000
--- a/tests/data/lecp1-la/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = certificate.pem jks.keystore Makefile.am metadata.xml private-key-raw.pem public-key.pem
diff --git a/tests/data/sp1-la/Makefile.am b/tests/data/sp1-la/Makefile.am
deleted file mode 100644
index 45782b12..00000000
--- a/tests/data/sp1-la/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem
diff --git a/tests/data/sp5-saml2/Makefile.am b/tests/data/sp5-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/sp5-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/data/sp6-saml2/Makefile.am b/tests/data/sp6-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/sp6-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/data/sp7-saml2/Makefile.am b/tests/data/sp7-saml2/Makefile.am
deleted file mode 100644
index adcdf09d..00000000
--- a/tests/data/sp7-saml2/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = metadata.xml private-key.pem
diff --git a/tests/metadata/Makefile.am b/tests/metadata/Makefile.am
deleted file mode 100644
index 956054a0..00000000
--- a/tests/metadata/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = \
-	metadata_01.xml \
-	metadata_02.xml \
-	metadata_03.xml \
-	metadata_04.xml \
-	metadata_05.xml \
-	metadata_06.xml