diff --git a/ansi-tests/ensure-directories-exist.lsp b/ansi-tests/ensure-directories-exist.lsp
index 043abeb2ec884c953a67f195ca2a2d84b9cd2221..eb8f3f9e2fea8d793f0a4936799b1a634cae9399 100644
--- a/ansi-tests/ensure-directories-exist.lsp
+++ b/ansi-tests/ensure-directories-exist.lsp
@@ -143,12 +143,12 @@
 ;; Need to add a LPN test
 
 (deftest ensure-directories-exist.error.1
-  (signals-error
+  (signals-error-always
    (ensure-directories-exist
     (make-pathname :directory '(:relative :wild)
 		   :defaults *default-pathname-defaults*))
    file-error)
-  t)
+  t t)
 
 (deftest ensure-directories-exist.error.2
   (signals-error (ensure-directories-exist) program-error)
diff --git a/ansi-tests/file-author.lsp b/ansi-tests/file-author.lsp
index 5b93c3b207a9b762e3b18ea97c8a4a5c4239c68e..7422f5874411ff07f14aeaded05ec5f89da621ab 100644
--- a/ansi-tests/file-author.lsp
+++ b/ansi-tests/file-author.lsp
@@ -66,28 +66,15 @@
   t)
 
 (deftest file-author.error.3
-  (signals-error
+  (signals-error-always
    (file-author (make-pathname :name :wild :type "lsp"
 			       :defaults *default-pathname-defaults*))
    file-error)
-  t)
+  t t)
 
 (deftest file-author.error.4
-  (signals-error
+  (signals-error-always
    (file-author (make-pathname :name "file-author" :type :wild
 			       :defaults *default-pathname-defaults*))
    file-error)
-  t)
-
-
-
-
-
-
-
-
-
-
-
-
-
+  t t)
diff --git a/ansi-tests/file-write-date.lsp b/ansi-tests/file-write-date.lsp
index 5d4b23512ce82a3eeaffb4bbae9435d9cfbf7ae4..751d7cdcbbe34190f7a11c2484df14d98929aad0 100644
--- a/ansi-tests/file-write-date.lsp
+++ b/ansi-tests/file-write-date.lsp
@@ -65,15 +65,15 @@
   t)
 
 (deftest file-write-date.error.3
-  (signals-error
+  (signals-error-always
    (file-write-date (make-pathname :name :wild :type "lsp"
 				   :defaults *default-pathname-defaults*))
    file-error)
-  t)
+  t t)
 
 (deftest file-write-date.error.4
-  (signals-error
+  (signals-error-always
    (file-write-date (make-pathname :name "file-write-date" :type :wild
 				   :defaults *default-pathname-defaults*))
    file-error)
-  t)
+  t t)
diff --git a/ansi-tests/open.lsp b/ansi-tests/open.lsp
index 143a20eb5f8343e7bb1c1fa6e68b067e40364ca7..8096a290528010c9c77c357f1d3e0e3b35fa3404 100644
--- a/ansi-tests/open.lsp
+++ b/ansi-tests/open.lsp
@@ -1102,135 +1102,135 @@
   t)
 
 (deftest open.error.2
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (close (open pn :direction :output :if-does-not-exist :create))
      (open pn :if-exists :error :direction :output))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.3
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (close (open pn :direction :output :if-does-not-exist :create))
      (open pn :if-exists :error :direction :io))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.4
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.5
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :if-does-not-exist :error))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.6
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :input))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.7
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :if-does-not-exist :error :direction :input))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.8
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :output :if-does-not-exist :error))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.9
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :io :if-does-not-exist :error))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.10
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :probe :if-does-not-exist :error))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.11
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :output :if-exists :overwrite))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.12
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :output :if-exists :append))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.13
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :io :if-exists :overwrite))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.14
-  (signals-error
+  (signals-error-always
    (let ((pn #p"tmp.dat"))
      (delete-all-versions pn)
      (open pn :direction :io :if-exists :append))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.15
-  (signals-error
+  (signals-error-always
    (open (make-pathname :name :wild :type "lsp"))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.16
-  (signals-error
+  (signals-error-always
    (open (make-pathname :name "open" :type :wild))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.17
-  (signals-error
+  (signals-error-always
    (let ((pn (make-pathname :name "open" :type "lsp" :version :wild)))
      (if (wild-pathname-p pn) (open pn)
        (error 'file-error)))
    file-error)
-  t)
+  t t)
 
 (deftest open.error.18
-  (signals-error
+  (signals-error-always
    (open #p"tmp.dat" :direction :output :if-exists :supersede
 	 :external-form (gensym))
    error)
-  t)
+  t t)
 
 
 ;;; FIXME -- add tests for :element-type :default
\ No newline at end of file
diff --git a/ansi-tests/peek-char.lsp b/ansi-tests/peek-char.lsp
index 87aa6d0fda6fde0ba87f09c0ab16b623b00688df..36b021213708595f7a472396a4a77d3f3f8f9ec3 100644
--- a/ansi-tests/peek-char.lsp
+++ b/ansi-tests/peek-char.lsp
@@ -284,36 +284,36 @@
 
 
 (deftest peek-char.error.2
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (*standard-input* "")
     (peek-char))
    end-of-file)
-  t)
+  t t)
 
 (deftest peek-char.error.3
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (peek-char nil s))
    end-of-file)
-  t)
+  t t)
 
 (deftest peek-char.error.4
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s " ")
     (peek-char t s))
    end-of-file)
-  t)
+  t t)
 
 (deftest peek-char.error.5
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "abcd")
     (peek-char #\z s))
    end-of-file)
-  t)
+  t t)
 
 ;;; There was a consensus on comp.lang.lisp that the requirement
 ;;; that an end-of-file error be thrown in the following case
diff --git a/ansi-tests/probe-file.lsp b/ansi-tests/probe-file.lsp
index 1eb5e8ec3c0687823fcbab2c1a03adca1f15b02c..5abc122e43c1b58dab936cb9e9ccf318b67928e0 100644
--- a/ansi-tests/probe-file.lsp
+++ b/ansi-tests/probe-file.lsp
@@ -38,9 +38,9 @@
   t)
 
 (deftest probe-file.error.3
-  (signals-error (probe-file (make-pathname :name :wild)) file-error)
-  t)
+  (signals-error-always (probe-file (make-pathname :name :wild)) file-error)
+  t t)
 
 (deftest probe-file.error.4
-  (signals-error (probe-file "CLTEST:*.FOO") file-error)
-  t)
+  (signals-error-always (probe-file "CLTEST:*.FOO") file-error)
+  t t)
diff --git a/ansi-tests/read-byte.lsp b/ansi-tests/read-byte.lsp
index 64d0da02615238246d9e30abe71267577eaba5ac..72fe845c8585a2339b458357eb498d47431042b8 100644
--- a/ansi-tests/read-byte.lsp
+++ b/ansi-tests/read-byte.lsp
@@ -115,21 +115,21 @@
   t)
 
 (deftest read-byte.error.4
-  (progn
-    (let ((s (open "foo.txt"
-		   :direction :output
-		   :if-exists :supersede
-		  :element-type '(unsigned-byte 8))))
-      (close s))
-    (signals-error
+  (signals-error-always
+   (progn
      (let ((s (open "foo.txt"
-		   :direction :input
-		   :element-type '(unsigned-byte 8))))
+		    :direction :output
+		    :if-exists :supersede
+		    :element-type '(unsigned-byte 8))))
+       (close s))
+     (let ((s (open "foo.txt"
+		    :direction :input
+		    :element-type '(unsigned-byte 8))))
        (unwind-protect
 	   (read-byte s t)
-	 (close s)))
-     end-of-file))
-  t)
+	 (close s))))
+   end-of-file)
+  t t)
 
 (deftest read-byte.error.5
   (loop for x in *mini-universe*
diff --git a/ansi-tests/read-char-no-hang.lsp b/ansi-tests/read-char-no-hang.lsp
index 2f48103bf1504fd4161c72e06b90416fe2ea5373..9a6e168f2d220a1b97f68c160a5bce9d5c29f062 100644
--- a/ansi-tests/read-char-no-hang.lsp
+++ b/ansi-tests/read-char-no-hang.lsp
@@ -99,25 +99,25 @@
   t)
 
 (deftest read-char-no-hang.error.2
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char-no-hang s))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-char-no-hang.error.3
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char-no-hang s t))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-char-no-hang.error.4
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char-no-hang s t t))
    end-of-file)
-  t)
+  t t)
diff --git a/ansi-tests/read-char.lsp b/ansi-tests/read-char.lsp
index e1b4de9b2a8ce1b549ed3abd61410e1987970559..0b635404b57028fabb146f7c47bbea9ff3780f8c 100644
--- a/ansi-tests/read-char.lsp
+++ b/ansi-tests/read-char.lsp
@@ -97,25 +97,25 @@
   t)
 
 (deftest read-char.error.2
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char s))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-char.error.3
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char s t))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-char.error.4
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-char s t t))
    end-of-file)
-  t)
+  t t)
diff --git a/ansi-tests/read-line.lsp b/ansi-tests/read-line.lsp
index 719553ad7424909c1575e1283ee56bfb8a737049..8f9c744f478ef239b7fbf6cb1ea161f21b84be8b 100644
--- a/ansi-tests/read-line.lsp
+++ b/ansi-tests/read-line.lsp
@@ -79,26 +79,26 @@
   t)
 
 (deftest read-line.error.2
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-line s))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-line.error.3
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (*standard-input* "")
     (read-line))
    end-of-file)
-  t)
+  t t)
 
 (deftest read-line.error.4
-  (signals-error
+  (signals-error-always
    (with-input-from-string
     (s "")
     (read-line s t))
    end-of-file)
-  t)
+  t t)
 
diff --git a/ansi-tests/truename.lsp b/ansi-tests/truename.lsp
index c59806acf6837b516d85b69806fab4f3c931e45d..a11c78f8f3ada9aac3c416455ac12ccc44c7a401 100644
--- a/ansi-tests/truename.lsp
+++ b/ansi-tests/truename.lsp
@@ -80,25 +80,21 @@
   t)
 
 (deftest truename.error.3
-  (signals-error (truename "nonexistent") file-error)
-  t)
+  (signals-error-always (truename "nonexistent") file-error)
+  t t)
 
 (deftest truename.error.4
-  (signals-error (truename #p"nonexistent") file-error)
-  t)
+  (signals-error-always (truename #p"nonexistent") file-error)
+  t t)
 
 (deftest truename.error.5
-  (signals-error (truename (logical-pathname "CLTESTROOT:nonexistent")) file-error)
-  t)
+  (signals-error-always (truename (logical-pathname "CLTESTROOT:nonexistent")) file-error)
+  t t)
 
 (deftest truename.error.6
-  (signals-error
+  (signals-error-always
    (let ((pn (make-pathname :name :wild
 			    :defaults *default-pathname-defaults*)))
-     (truename pn)) file-error)
-  t)
-
-
-
-
-
+     (truename pn))
+   file-error)
+  t t)