diff --git a/ansi-tests/clear-input.lsp b/ansi-tests/clear-input.lsp
index f329c8885c7742acb912ced29331e9592e716a08..045fea9cc33c276290adfe5ee96cad3f76fb7b3d 100644
--- a/ansi-tests/clear-input.lsp
+++ b/ansi-tests/clear-input.lsp
@@ -29,14 +29,24 @@
 ;;; Error cases
 
 (deftest clear-input.error.1
+  :notes (:assume-no-simple-streams)
   (signals-error (clear-input t nil) program-error)
   t)
 
 (deftest clear-input.error.2
+  :notes (:assume-no-simple-streams)
   (signals-error (clear-input nil nil) program-error)
   t)
 
 (deftest clear-input.error.3
+  (signals-error (clear-input t nil nil) program-error)
+  t)
+
+(deftest clear-input.error.4
+  (signals-error (clear-input nil nil nil) program-error)
+  t)
+
+(deftest clear-input.error.5
   (loop for x in *mini-universe*
 	unless (or (member x '(nil t))
 		   (typep x 'stream)
diff --git a/ansi-tests/file-length.lsp b/ansi-tests/file-length.lsp
index 1a150634eb2e7af74ce24cadb587fece1435fcb5..1fab2b7dc5d958e644ec3e53de002fa55b8ac476 100644
--- a/ansi-tests/file-length.lsp
+++ b/ansi-tests/file-length.lsp
@@ -27,6 +27,7 @@
   nil)
 
 (deftest file-length.error.4
+  :notes (:assume-no-simple-streams :assume-no-gray-streams)
   (signals-error (with-input-from-string (s "abc") (file-length s))
 		 type-error)
   t)
@@ -86,6 +87,7 @@
   t)
 
 (deftest file-length.error.11
+  :notes (:assume-no-simple-streams :assume-no-gray-streams)
   (signals-error
    (let ((s (make-string-input-stream "abcde")))
      (unwind-protect (file-length s) (close s)))
@@ -93,6 +95,7 @@
   t)
 
 (deftest file-length.error.12
+  :notes (:assume-no-simple-streams :assume-no-gray-streams)
   (signals-error
    (let ((s (make-string-output-stream)))
      (unwind-protect (file-length s) (close s)))
diff --git a/ansi-tests/listen.lsp b/ansi-tests/listen.lsp
index fff24e435f4bb2a65d6adfe600915a71df01bf95..f9680aa10c558b3234005d345a52ef845da7f212 100644
--- a/ansi-tests/listen.lsp
+++ b/ansi-tests/listen.lsp
@@ -50,11 +50,10 @@
 ;;; Error tests
 
 (deftest listen.error.1
+  :notes (:assume-no-simple-streams)
   (signals-error (listen *standard-input* nil) program-error)
   t)
 
-  
-		  
-
-
-
+(deftest listen.error.2
+  (signals-error (listen *standard-input* nil nil) program-error)
+  t)
diff --git a/ansi-tests/notes.lsp b/ansi-tests/notes.lsp
index e94b6fc2f9f1f2101bb508045e92aa879480706f..cd36ce4a088e8f17f886dd1ae7811633dc28d5bb 100644
--- a/ansi-tests/notes.lsp
+++ b/ansi-tests/notes.lsp
@@ -19,3 +19,10 @@
 
 (defnote :type-of/strict-builtins
   "Interpret requirement 1.a on the TYPE-OF page to apply to all built-in types that contain the object, not just to some builtin type that contains the object.")
+
+(defnote :assume-no-gray-streams
+  "Disable the test if gray streams are present.")
+
+(defnote :assume-no-simple-streams
+  "Disable the test if simple streams are present.")
+
diff --git a/ansi-tests/stream-element-type.lsp b/ansi-tests/stream-element-type.lsp
index fdbc4bf74abc008594ffec7c76cc8a0f5fc6f9d9..6142b229873eb4f33c1e1a5fbe56ae0ce468c319 100644
--- a/ansi-tests/stream-element-type.lsp
+++ b/ansi-tests/stream-element-type.lsp
@@ -62,6 +62,7 @@
 
 
 (deftest stream-element-type.5
+  :notes (:assume-no-simple-streams)
   (let ((pn "foo.txt"))
     (delete-all-versions pn)
     (let ((s (open pn :direction :output)))