diff --git a/tests/Makefile.am b/tests/Makefile.am
index aed12ff..66ace5e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -197,8 +197,6 @@ mont_SOURCES = mont.c
 TESTS += optionstest
 check_PROGRAMS += optionstest
 optionstest_SOURCES = optionstest.c
-optionstest_SOURCES += $(top_srcdir)/apps/apps.c
-optionstest_SOURCES += $(top_srcdir)/apps/strtonum.c
 
 # pbkdf2
 TESTS += pbkdf2
@@ -281,6 +279,7 @@ EXTRA_DIST += testssl ca.pem server.pem
 # testdsa
 TESTS += testdsa.sh
 EXTRA_DIST += testdsa.sh
+EXTRA_DIST += openssl.cnf
 
 # testenc
 TESTS += testenc.sh
diff --git a/tests/optionstest.c b/tests/optionstest.c
index 0cedfe6..e860f0d 100644
--- a/tests/optionstest.c
+++ b/tests/optionstest.c
@@ -23,6 +23,8 @@
 #include <openssl/conf.h>
 
 #include <apps.h>
+#include <apps.c>
+#include <strtonum.c>
 
 /* Needed to keep apps.c happy... */
 BIO *bio_err;
diff --git a/tests/testdsa.sh b/tests/testdsa.sh
index 413323e..205b564 100755
--- a/tests/testdsa.sh
+++ b/tests/testdsa.sh
@@ -30,6 +30,6 @@ if [ $? != 0 ]; then
         exit 1;
 fi
 
-rm testdsa.key
+rm testdsa.key dsa512.pem testdsa.pem
 
 exit 0
diff --git a/tests/testrsa.sh b/tests/testrsa.sh
index cb4e28d..c96ad25 100755
--- a/tests/testrsa.sh
+++ b/tests/testrsa.sh
@@ -30,4 +30,6 @@ if [ $? != 0 ]; then
         exit 1;
 fi
 
+rm -f rsacert.pem rsakey.pem
+
 exit 0