diff --git a/src/tests/config.lsp.in b/src/tests/config.lsp.in
index 184b48922..a0525775c 100755
--- a/src/tests/config.lsp.in
+++ b/src/tests/config.lsp.in
@@ -87,8 +87,8 @@
   (loop with root = (si::get-library-pathname)
 	with lib-name = (format nil "../lib/ecl-~A/" (lisp-implementation-version))
 	for base in (list root (merge-pathnames lib-name root))
-	for p = (merge-pathnames "./LGPL" base)
-	when (probe-file p)
+	when (or (probe-file (merge-pathnames "./BUILD-STAMP" base))
+		 (probe-file (merge-pathnames "./LGPL" base)))
 	do (return base)))
 
 (setf (logical-pathname-translations "SYS")
@@ -253,7 +253,7 @@
 			   :error :output
 			   :wait t))
       (when (probe-file tmp)
-	(delete-file tmp))
+	(ignore-errors (delete-file tmp)))
       (ext:chdir *here*))))
 
 (defun run-regressions-tests (&optional (output (merge-pathnames "regressions.log"