diff --git a/tests/Makefile.am b/tests/Makefile.am
index 63b2497..b96355a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,9 @@ if ENABLE_OPENPGP
 SUBDIRS += openpgp-certs
 endif
 
-EXTRA_DIST = libgcrypt.supp hostname-check.README
+SHELL_TESTS = rfc2253-escape-test
+
+EXTRA_DIST = libgcrypt.supp hostname-check.README $(SHELL_TESTS)
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
@@ -58,7 +60,7 @@ ctests = simple gc set_pkcs12_cred certder mpi				\
 	finished hostname-check cve-2008-4989 pkcs12_s2k chainverify	\
 	crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416		\
 	crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain		\
-	nul-in-x509-names rfc2231-escape-test
+	nul-in-x509-names
 
 if ENABLE_OPENSSL
 ctests +=  openssl
@@ -86,7 +88,7 @@ ctests +=  oprfi
 endif
 
 check_PROGRAMS = $(ctests)
-TESTS = $(ctests)
+TESTS = $(ctests) $(SHELL_TESTS)
 
 TESTS_ENVIRONMENT = \
 	PKCS12FILE=$(srcdir)/pkcs12-decode/client.p12	\