diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 6e73ff43459055fb24ff231bee81507ba8664ae1..c61a8d981569baf721ac893e161f028c879dfb8c 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = -I$(top_srcdir) @CFLAGS@ -O0
+CFLAGS = -I$(top_srcdir) @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 
 TS_PROGS = aes-test arcfour-test blowfish-test cast128-test \
@@ -29,5 +29,5 @@ $(M4_FILES:.m4=.c): %.c: macros.m4 %.m4
 check: run-tests
 
 run-tests: $(TS_PROGS)
-	$(srcdir)/run-tests $^
+	srcdir="$(srcdir)" "$(srcdir)"/run-tests $^