diff --git a/system.lisp b/system.lisp
index 6fef6cbb00b4b6197c223bbc16acdf031c35ee4b..d104595cdb142eee75be1ac03f03d0fecc0d49ad 100644
--- a/system.lisp
+++ b/system.lisp
@@ -140,6 +140,7 @@ located."
 (defmethod builtin-system-p ((s system))
   (let* ((system (find-system s nil))
          (sysdir (and system (component-pathname system)))
+         (truesysdir (and sysdir (truename* sysdir)))
          (impdir (lisp-implementation-directory :truename t)))
-    (and sysdir impdir (pathname-match-p (truename sysdir) (wilden impdir)) t)))
+    (and truesysdir impdir (pathname-match-p truesysdir (wilden impdir)) t)))
 
diff --git a/test/test-force.script b/test/test-force.script
index 50f18c4e97724becc59cfe363f958705bf384262..88fd9bbaf412ab87d038891d7cacfb8f3a768ebe 100644
--- a/test/test-force.script
+++ b/test/test-force.script
@@ -15,6 +15,7 @@
     (assert file1-date)
 
     ;; unforced, date should stay same
+    (touch-file "test-force.asd" :timestamp date1)
     (touch-file "file1.lisp" :timestamp date1)
     (touch-file file1 :timestamp date2)
     (asdf:operate 'asdf:load-op 'test-force)
diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script
index 4e79e08bb5491f47f7c518da820edf2ff1856aad..bc3eced42782a8c96a0869c3e9d084e1cb00a3e6 100644
--- a/test/test-logical-pathname.script
+++ b/test/test-logical-pathname.script
@@ -31,7 +31,7 @@
    (setf *central-registry* '())
    (initialize-source-registry
     '(:source-registry (:directory #p"ASDF:test;") :ignore-inherited-configuration))
-   (load-system :test-logical-pathname :force t))
+   (load-system :test-logical-pathname :force t :verbose t))
 
  #-(or xcl gcl<2.7)
  (progn