diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index d732f0f9..320b4152 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -76,7 +76,7 @@ clean: clean-extras
 	@rm -rf *.la *.lo *.o *.slo .libs msc_test msc-test-debug.log
 
 maintainer-clean: clean
-	@rm -rf Makefile mlogc-src/Makefile t/run-unit-tests.pl t/run-regression-tests.pl config config.log config.status configure mod_security2_config.h ../tools/*.pl autoscan.log configure.scan build/libtool.m4 build/config.guess build/config.sub build/ltmain.sh build/apxs-wrapper
+	@rm -rf Makefile mlogc-src/Makefile t/run-unit-tests.pl t/run-regression-tests.pl t/gen_rx-pm.pl t/csv_rx-pm.pl t/run-tests.pl t/regression/server_root/conf/httpd.conf t/regression/server_root/conf/config_*.t_*.conf config config.log config.status configure mod_security2_config.h ../tools/*.pl autoscan.log configure.scan build/libtool.m4 build/config.guess build/config.sub build/ltmain.sh build/apxs-wrapper
 
 distclean: maintainer-clean
 
diff --git a/apache2/t/regression/server_root/conf/httpd.conf.in b/apache2/t/regression/server_root/conf/httpd.conf.in
index 7d45cdbf..6e6109b7 100644
--- a/apache2/t/regression/server_root/conf/httpd.conf.in
+++ b/apache2/t/regression/server_root/conf/httpd.conf.in
@@ -23,6 +23,8 @@
 
 ServerName localhost
 
+CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp
+
 LogLevel debug
 ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
 
diff --git a/apache2/t/run-regression-tests.pl.in b/apache2/t/run-regression-tests.pl.in
index 032c5b41..6ddfbb8a 100755
--- a/apache2/t/run-regression-tests.pl.in
+++ b/apache2/t/run-regression-tests.pl.in
@@ -279,6 +279,7 @@ sub runfile {
 
 			# Search for all file matches
 			if ($rc == 0 and exists $t{match_file} and defined $t{match_file}) {
+				sleep 1; # Make sure the file exists
 				for my $key (keys %{ $t{match_file} || {}}) {
 					my($neg,$fn) = ($key =~ m/^(-?)(.*)$/);
 					my $m = $t{match_file}{$key};