diff --git a/configure.ac b/configure.ac
index 37cda2cc..c72916fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,6 +581,11 @@ php/xml/Makefile
 python/Makefile
 swig/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
 lasso.pc
 ])
 AC_MSG_RESULT([
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77648670..53b7bbb3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
 	-DPACKAGE=\"@PACKAGE@\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lasso \
+	-DTESTSDATADIR=\"$(srcdir)/data/\" \
 	$(LASSO_DEFINES) \
 	$(LASSO_CFLAGS) \
 	$(CHECK_CFLAGS)
@@ -20,3 +21,5 @@ endif
 
 EXTRA_DIST = tests.c login_tests.c basic_tests.c
 
+SUBDIRS = data
+
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
new file mode 100644
index 00000000..62fec9d8
--- /dev/null
+++ b/tests/data/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = ca1-la idp1-la lecp1-la sp1-la
diff --git a/tests/data/ca1-la/Makefile.am b/tests/data/ca1-la/Makefile.am
new file mode 100644
index 00000000..5fdef586
--- /dev/null
+++ b/tests/data/ca1-la/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = certificate.pem jks.keystore
diff --git a/tests/data/idp1-la/Makefile.am b/tests/data/idp1-la/Makefile.am
new file mode 100644
index 00000000..cfa52815
--- /dev/null
+++ b/tests/data/idp1-la/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem
diff --git a/tests/data/lecp1-la/Makefile.am b/tests/data/lecp1-la/Makefile.am
new file mode 100644
index 00000000..0f538dc9
--- /dev/null
+++ b/tests/data/lecp1-la/Makefile.am
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..cfa52815
--- /dev/null
+++ b/tests/data/sp1-la/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = certificate.pem jks.keystore metadata.xml private-key-raw.pem public-key.pem