Index: Makefile.in
===================================================================
--- Makefile.in	(revision 14309)
+++ Makefile.in	(working copy)
@@ -363,7 +363,7 @@
 # Automatically configure and run Apache httpd on a random port, and then
 # run make check.
 davautocheck: 
-	@sh $(top_srcdir)/subversion/tests/clients/cmdline/davautocheck.sh
+	@APXS=@APXS@ sh $(top_srcdir)/subversion/tests/clients/cmdline/davautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline
Index: subversion/tests/clients/cmdline/davautocheck.sh
===================================================================
--- subversion/tests/clients/cmdline/davautocheck.sh	(revision 14309)
+++ subversion/tests/clients/cmdline/davautocheck.sh	(working copy)
@@ -41,6 +41,21 @@
 SCRIPTDIR=$(dirname $0)
 SCRIPT=$(basename $0)
 
+trap cleanup SIGHUP SIGTERM SIGINT
+
+function cleanup() {
+    [ -e  "$HTTPD_PID" ] && 
+      kill $(cat "$HTTPD_PID")
+
+    [ -e  "$HTTPD_LOG" ] && 
+      query 'Browse server error log' n \
+        && less "$HTTPD_LOG"
+
+    [ -e  "$HTTPD_ROOT" ] && 
+      query 'Delete HTTPD root directory' y \
+        && rm -fr "$HTTPD_ROOT/"
+}
+
 function say() {
   echo "$SCRIPT: $*"
 }
@@ -88,7 +103,7 @@
   return 1
 }
 
-# Pick up value from Makefile or PATH (also try apxs2, which is used by Debian)
+# Pick up value from environment or PATH (also try apxs2 - for Debian)
 [ ${APXS:+set} ] \
  || APXS=$(which apxs) \
  || APXS=$(which apxs2) \
@@ -244,12 +259,6 @@
 
 say "Finished testing..."
 
-kill $(cat "$HTTPD_PID")
+cleanup
 
-query 'Browse server error log' n \
-  && less "$HTTPD_LOG"
-
-query 'Delete HTTPD root directory' y \
-  && rm -fr "$HTTPD_ROOT/"
-
 say 'Done'