diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7414dfb8..7e896ddd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = tests perfs tests2
 INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
 	-DTESTSDATADIR=\"$(srcdir)/data/\" \
-	-DTESTSMETADATADIR=\"$(srcdir)/metadata/\" \
+	-DTESTSMETADATADIR=\"$(srcdir)/data/metadata/\" \
 	$(LASSO_CFLAGS) \
 	$(CHECK_CFLAGS)
 
diff --git a/tests/metadata/feide-prod.xml b/tests/data/metadata/feide-prod.xml
similarity index 100%
rename from tests/metadata/feide-prod.xml
rename to tests/data/metadata/feide-prod.xml
diff --git a/tests/metadata/googleapps_metadata.xml b/tests/data/metadata/googleapps_metadata.xml
similarity index 100%
rename from tests/metadata/googleapps_metadata.xml
rename to tests/data/metadata/googleapps_metadata.xml
diff --git a/tests/metadata/metadata_01.xml b/tests/data/metadata/metadata_01.xml
similarity index 100%
rename from tests/metadata/metadata_01.xml
rename to tests/data/metadata/metadata_01.xml
diff --git a/tests/metadata/metadata_02.xml b/tests/data/metadata/metadata_02.xml
similarity index 100%
rename from tests/metadata/metadata_02.xml
rename to tests/data/metadata/metadata_02.xml
diff --git a/tests/metadata/metadata_03.xml b/tests/data/metadata/metadata_03.xml
similarity index 100%
rename from tests/metadata/metadata_03.xml
rename to tests/data/metadata/metadata_03.xml
diff --git a/tests/metadata/metadata_04.xml b/tests/data/metadata/metadata_04.xml
similarity index 100%
rename from tests/metadata/metadata_04.xml
rename to tests/data/metadata/metadata_04.xml
diff --git a/tests/metadata/metadata_05.xml b/tests/data/metadata/metadata_05.xml
similarity index 100%
rename from tests/metadata/metadata_05.xml
rename to tests/data/metadata/metadata_05.xml
diff --git a/tests/metadata/metadata_06.xml b/tests/data/metadata/metadata_06.xml
similarity index 100%
rename from tests/metadata/metadata_06.xml
rename to tests/data/metadata/metadata_06.xml
diff --git a/tests/metadata/simplesamlphp-metadata.xml b/tests/data/metadata/simplesamlphp-metadata.xml
similarity index 100%
rename from tests/metadata/simplesamlphp-metadata.xml
rename to tests/data/metadata/simplesamlphp-metadata.xml