diff --git a/src/tests/client_server/Makefile.am b/src/tests/client_server/Makefile.am
index c1e45576..76d0656e 100644
--- a/src/tests/client_server/Makefile.am
+++ b/src/tests/client_server/Makefile.am
@@ -73,9 +73,11 @@ test_postprocessor_LDADD = \
 
 # TODO: fix out-of-tree 'make check'
 EXTRA_DIST = \
-  root-ca.crt \
-  inter1-ca.crt \
-  inter2-ca.crt \
-  test-server.crt \
-  test-server-key.pem \
-  chain.crt
+  data/root-ca.crt \
+  data/inter1-ca.crt \
+  data/inter2-ca.crt \
+  data/test-server.crt \
+  data/test-server-key.pem \
+  data/check_certs.sh \
+  data/make_chain.sh \
+  data/chain.crt
diff --git a/src/tests/client_server/data/check_certs.sh b/src/tests/client_server/data/check_certs.sh
old mode 100644
new mode 100755
diff --git a/src/tests/client_server/data/make_chain.sh b/src/tests/client_server/data/make_chain.sh
old mode 100644
new mode 100755