diff --git a/ansi-tests/cons-test-17.lsp b/ansi-tests/cons-test-17.lsp
index 862e42c6b5d853cf9df2c489e15c1b3bb507dd19..f489bf065c902cf79008ea7a4f198ac474f921cd 100644
--- a/ansi-tests/cons-test-17.lsp
+++ b/ansi-tests/cons-test-17.lsp
@@ -206,7 +206,7 @@
     (values
      (rassoc (progn (setf x (incf i)) 'c)
 	     (progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c)))
-	     :test (progn (setf z (incf i)) #'eq))
+	     :test (progn (setf z (incf i)) #'eql))
      i x y z))
   (3 . c) 3 1 2 3)
 
@@ -215,7 +215,7 @@
     (values
      (rassoc (progn (setf x (incf i)) 'c)
 	    (progn (setf y (incf i)) '((1 . a) (2 . b) (3 . c) (4 . c)))
-	    :test #'eq)
+	    :test #'eql)
      i x y))
   (3 . c) 2 1 2)
 
diff --git a/ansi-tests/count.lsp b/ansi-tests/count.lsp
index 33939db365749e09c113f57a0d6f5cdf1327d422..e75daf4c592e41f427591f4be84e9e5498d6618f 100644
--- a/ansi-tests/count.lsp
+++ b/ansi-tests/count.lsp
@@ -10,11 +10,11 @@
   2)
 
 (deftest count-list.2
-  (count 'a '(a b c d e a e f) :test #'eq)
+  (count 'a '(a b c d e a e f) :test #'eql)
   2)
 
 (deftest count-list.3
-  (count 'a '(a b c d e a e f) :test 'eq)
+  (count 'a '(a b c d e a e f) :test 'eql)
   2)
 
 (deftest count-list.4
@@ -71,7 +71,7 @@
   7)
 
 (deftest count-list.15
-  (count 1 '(1 1 1 1 1 2 1 1)  :test-not #'eq)
+  (count 1 '(1 1 1 1 1 2 1 1)  :test-not #'eql)
   1)
 
 (deftest count-list.16
@@ -86,11 +86,11 @@
   2)
 
 (deftest count-vector.2
-  (count 'a #(a b c d e a e f) :test #'eq)
+  (count 'a #(a b c d e a e f) :test #'eql)
   2)
 
 (deftest count-vector.3
-  (count 'a #(a b c d e a e f) :test 'eq)
+  (count 'a #(a b c d e a e f) :test 'eql)
   2)
 
 (deftest count-vector.4
@@ -147,7 +147,7 @@
   7)
 
 (deftest count-vector.15
-  (count 1 #(1 1 1 1 1 2 1 1)  :test-not #'eq)
+  (count 1 #(1 1 1 1 1 2 1 1)  :test-not #'eql)
   1)
 
 (deftest count-vector16
@@ -165,13 +165,13 @@
 (deftest count-filled-vector.2
   (count 'a (make-array 8 :initial-contents '(a b c d e a e f)
 			:fill-pointer t)
-	 :test #'eq)
+	 :test #'eql)
   2)
 
 (deftest count-filled-vector.3
   (count 'a (make-array 8 :initial-contents '(a b c d e a e f)
 			:fill-pointer t)
-	 :test 'eq)
+	 :test 'eql)
   2)
 
 (deftest count-filled-vector.4
@@ -250,7 +250,7 @@
 (deftest count-filled-vector.15
   (count 1 (make-array 8 :initial-contents '(1 1 1 1 1 2 1 1)
 		       :fill-pointer t)
-	 :test-not #'eq)
+	 :test-not #'eql)
   1)
 
 (deftest count-filled-vector.16
@@ -291,11 +291,11 @@
   7)
 
 (deftest count-bit-vector.2
-  (count 1 #*00101100011011000 :test #'eq)
+  (count 1 #*00101100011011000 :test #'eql)
   7)
 
 (deftest count-bit-vector.3
-  (count 1 #*00101100011011000 :test 'eq)
+  (count 1 #*00101100011011000 :test 'eql)
   7)
 
 (deftest count-bit-vector.4
@@ -348,7 +348,7 @@
   7)
 
 (deftest count-bit-vector.15
-  (count 1 #*11111011  :test-not #'eq)
+  (count 1 #*11111011  :test-not #'eql)
   1)
 
 (deftest count-bit-vector.16
@@ -392,11 +392,11 @@
   7)
 
 (deftest count-string.2
-  (count #\1 "00101100011011000" :test #'eq)
+  (count #\1 "00101100011011000" :test #'eql)
   7)
 
 (deftest count-string.3
-  (count #\1 "00101100011011000" :test 'eq)
+  (count #\1 "00101100011011000" :test 'eql)
   7)
 
 (deftest count-string.4
@@ -451,7 +451,7 @@
   7)
 
 (deftest count-string.15
-  (count #\1 "11111011"  :test-not #'eq)
+  (count #\1 "11111011"  :test-not #'eql)
   1)
 
 (deftest count-string.16
diff --git a/ansi-tests/find.lsp b/ansi-tests/find.lsp
index bd9efddb6d0ab55f7d98c3b3b3dda32516243b71..7ed781289c47dc2227d955cacb24678e49863960 100644
--- a/ansi-tests/find.lsp
+++ b/ansi-tests/find.lsp
@@ -82,53 +82,53 @@
   4)
 
 (deftest find-list.14
-  (find 'a '(a a b a c e d a f a) :test (complement #'eq))
+  (find 'a '(a a b a c e d a f a) :test (complement #'eql))
   b)
 
 (deftest find-list.15
-  (find 'a '(a a b a c e d a f a) :test (complement #'eq)
+  (find 'a '(a a b a c e d a f a) :test (complement #'eql)
 	    :from-end t)
   f)
 
 (deftest find-list.16
-  (find 'a '(a a b a c e d a f a) :test-not #'eq)
+  (find 'a '(a a b a c e d a f a) :test-not #'eql)
   b)
 
 (deftest find-list.17
-  (find 'a '(a a b a c e d a f a) :test-not 'eq
+  (find 'a '(a a b a c e d a f a) :test-not 'eql
 	    :from-end t)
   f)
 
 (deftest find-list.18
-  (find 'a '(a a b a c e d a f a) :test-not 'eq)
+  (find 'a '(a a b a c e d a f a) :test-not 'eql)
   b)
 
 (deftest find-list.19
-  (find 'a '(a a b a c e d a f a) :test-not #'eq
+  (find 'a '(a a b a c e d a f a) :test-not #'eql
 	    :from-end t)
   f)
 
 (deftest find-list.20
-  (find 'a '(a a b a c e d a f a) :test-not #'eq)
+  (find 'a '(a a b a c e d a f a) :test-not #'eql)
   b)
 
 (deftest find-list.21
-  (find 'a '(a a b a c e d a f a) :test #'eq
+  (find 'a '(a a b a c e d a f a) :test #'eql
 	    :start 2)
   a)
 
 (deftest find-list.22
-  (find 'a '(a a b a c e d a f a) :test #'eq
+  (find 'a '(a a b a c e d a f a) :test #'eql
 	    :start 2 :end nil)
   a)
 
 (deftest find-list.23
-  (find 'a '(a a b a c e d a f a) :test-not #'eq
+  (find 'a '(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5)
   b)
 
 (deftest find-list.24
-  (find 'a '(a a b a c e d a f a) :test-not #'eq
+  (find 'a '(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   c)
 
@@ -237,53 +237,53 @@
   4)
 
 (deftest find-vector.14
-  (find 'a #(a a b a c e d a f a) :test (complement #'eq))
+  (find 'a #(a a b a c e d a f a) :test (complement #'eql))
   b)
 
 (deftest find-vector.15
-  (find 'a #(a a b a c e d a f a) :test (complement #'eq)
+  (find 'a #(a a b a c e d a f a) :test (complement #'eql)
 	    :from-end t)
   f)
 
 (deftest find-vector.16
-  (find 'a #(a a b a c e d a f a) :test-not #'eq)
+  (find 'a #(a a b a c e d a f a) :test-not #'eql)
   b)
 
 (deftest find-vector.17
-  (find 'a #(a a b a c e d a f a) :test-not 'eq
+  (find 'a #(a a b a c e d a f a) :test-not 'eql
 	    :from-end t)
   f)
 
 (deftest find-vector.18
-  (find 'a #(a a b a c e d a f a) :test-not 'eq)
+  (find 'a #(a a b a c e d a f a) :test-not 'eql)
   b)
 
 (deftest find-vector.19
-  (find 'a #(a a b a c e d a f a) :test-not #'eq
+  (find 'a #(a a b a c e d a f a) :test-not #'eql
 	    :from-end t)
   f)
 
 (deftest find-vector.20
-  (find 'a #(a a b a c e d a f a) :test-not #'eq)
+  (find 'a #(a a b a c e d a f a) :test-not #'eql)
   b)
 
 (deftest find-vector.21
-  (find 'a #(a a b a c e d a f a) :test #'eq
+  (find 'a #(a a b a c e d a f a) :test #'eql
 	    :start 2)
   a)
 
 (deftest find-vector.22
-  (find 'a #(a a b a c e d a f a) :test #'eq
+  (find 'a #(a a b a c e d a f a) :test #'eql
 	    :start 2 :end nil)
   a)
 
 (deftest find-vector.23
-  (find 'a #(a a b a c e d a f a) :test-not #'eq
+  (find 'a #(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5)
   b)
 
 (deftest find-vector.24
-  (find 'a #(a a b a c e d a f a) :test-not #'eq
+  (find 'a #(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   c)
 
@@ -435,120 +435,120 @@
   1)
 
 (deftest find-bit-vector.14
-  (find 0 #*0010111010 :test (complement #'eq))
+  (find 0 #*0010111010 :test (complement #'eql))
   1)
 
 (deftest find-bit-vector.15
-  (find 0 #*0010111010 :test (complement #'eq)
+  (find 0 #*0010111010 :test (complement #'eql)
 	    :from-end t)
   1)
 
 (deftest find-bit-vector.16
-  (find 0 #*0010111010 :test-not #'eq)
+  (find 0 #*0010111010 :test-not #'eql)
   1)
 
 (deftest find-bit-vector.16a
-  (find 1 #*111111111111 :test-not #'eq)
+  (find 1 #*111111111111 :test-not #'eql)
   nil)
 
 (deftest find-bit-vector.16b
-  (find 0 #*0000000 :test-not #'eq)
+  (find 0 #*0000000 :test-not #'eql)
   nil)
 
 (deftest find-bit-vector.17
-  (find 0 #*001011101 :test-not 'eq
+  (find 0 #*001011101 :test-not 'eql
 	:from-end t)
   1)
 
 (deftest find-bit-vector.17a
-  (find 0 #*0000000 :test-not 'eq
+  (find 0 #*0000000 :test-not 'eql
 	:from-end t)
   nil)
 
 (deftest find-bit-vector.17b
-  (find 1 #*111111111111 :test-not 'eq
+  (find 1 #*111111111111 :test-not 'eql
 	:from-end t)
   nil)
 
 (deftest find-bit-vector.18
-  (find 0 #*00101110 :test-not 'eq)
+  (find 0 #*00101110 :test-not 'eql)
   1)
 
 (deftest find-bit-vector.18a
-  (find 0 #*00000000 :test-not 'eq)
+  (find 0 #*00000000 :test-not 'eql)
   nil)
 
 (deftest find-bit-vector.19
-  (find 0 #*00101110 :test-not #'eq
+  (find 0 #*00101110 :test-not #'eql
 	    :from-end t)
   1)
 
 (deftest find-bit-vector.19a
-  (find 0 #*00000000 :test-not #'eq
+  (find 0 #*00000000 :test-not #'eql
 	:from-end t)
   nil)
 
 (deftest find-bit-vector.20
-  (find 0 #*00101110 :test-not #'eq)
+  (find 0 #*00101110 :test-not #'eql)
   1)
 
 (deftest find-bit-vector.21
-  (find 0 #*00101110 :test #'eq
+  (find 0 #*00101110 :test #'eql
 	:start 2)
   0)
 
 (deftest find-bit-vector.21a
-  (find 0 #*00111111 :test #'eq
+  (find 0 #*00111111 :test #'eql
 	:start 2)
   nil)
 
 (deftest find-bit-vector.21b
-  (find 1 #*00111111 :test #'eq
+  (find 1 #*00111111 :test #'eql
 	:start 2)
   1)
 
 (deftest find-bit-vector.22
-  (find 0 #*00101110 :test #'eq
+  (find 0 #*00101110 :test #'eql
 	:start 2 :end nil)
   0)
 
 (deftest find-bit-vector.22a
-  (find 0 #*001111111 :test #'eq
+  (find 0 #*001111111 :test #'eql
 	:start 2 :end nil)
   nil)
 
 (deftest find-bit-vector.22b
-  (find 1 #*001111111 :test #'eq
+  (find 1 #*001111111 :test #'eql
 	:start 2 :end nil)
   1)
 
 (deftest find-bit-vector.23
-  (find 0 #*00101110 :test-not #'eq
+  (find 0 #*00101110 :test-not #'eql
 	:start 0 :end 5)
   1)
 
 (deftest find-bit-vector.23a
-  (find 0 #*00000111 :test-not #'eq
+  (find 0 #*00000111 :test-not #'eql
 	:start 0 :end 5)
   nil)
 
 (deftest find-bit-vector.23b
-  (find 0 #*00001000 :test-not #'eq
+  (find 0 #*00001000 :test-not #'eql
 	:start 0 :end 5)
   1)
 
 (deftest find-bit-vector.24
-  (find 0 #*00101110 :test-not #'eq
+  (find 0 #*00101110 :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   1)
 
 (deftest find-bit-vector.24a
-  (find 0 #*0000001111 :test-not #'eq
+  (find 0 #*0000001111 :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   nil)
 
 (deftest find-bit-vector.24b
-  (find 0 #*0000100 :test-not #'eq
+  (find 0 #*0000100 :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   1)
 
@@ -679,34 +679,34 @@
   #\4)
 
 (deftest find-string.14
-  (find #\a "aabacedafa" :test (complement #'eq))
+  (find #\a "aabacedafa" :test (complement #'eql))
   #\b)
 
 (deftest find-string.15
-  (find #\a "aabacedafa" :test (complement #'eq)
+  (find #\a "aabacedafa" :test (complement #'eql)
 	    :from-end t)
   #\f)
 
 (deftest find-string.16
-  (find #\a "aabacedafa" :test-not #'eq)
+  (find #\a "aabacedafa" :test-not #'eql)
   #\b)
 
 (deftest find-string.17
-  (find #\a "aabacedafa" :test-not 'eq
+  (find #\a "aabacedafa" :test-not 'eql
 	    :from-end t)
   #\f)
 
 (deftest find-string.18
-  (find #\a "aabacedafa" :test-not 'eq)
+  (find #\a "aabacedafa" :test-not 'eql)
   #\b)
 
 (deftest find-string.19
-  (find #\a "aabacedafa" :test-not #'eq
+  (find #\a "aabacedafa" :test-not #'eql
 	    :from-end t)
   #\f)
 
 (deftest find-string.20
-  (find #\a "aabacedafa" :test-not #'eq)
+  (find #\a "aabacedafa" :test-not #'eql)
   #\b)
 
 (deftest find-string.21
diff --git a/ansi-tests/mismatch.lsp b/ansi-tests/mismatch.lsp
index 967805b13b71ad8ec6aa0bc6939b3cfa5265d043..589a9190c07ce177c3461206d8efacc37608512f 100644
--- a/ansi-tests/mismatch.lsp
+++ b/ansi-tests/mismatch.lsp
@@ -54,11 +54,11 @@
   2)
 
 (deftest mismatch-list.13
-  (mismatch '(1 2 3 4) '(1 2 3 4) :test 'eq)
+  (mismatch '(1 2 3 4) '(1 2 3 4) :test 'eql)
   nil)
 
 (deftest mismatch-list.14
-  (mismatch '(1 2 3 4) '(5 6 7 8) :test-not 'eq)
+  (mismatch '(1 2 3 4) '(5 6 7 8) :test-not 'eql)
   nil)
 
 (deftest mismatch-list.15
@@ -78,7 +78,7 @@
   7)
 
 (deftest mismatch-list.19
-  (mismatch '(1 1 1) '(2 2 2 2 2 1 2 2) :from-end t :test-not 'eq)
+  (mismatch '(1 1 1) '(2 2 2 2 2 1 2 2) :from-end t :test-not 'eql)
   1)
 
 (deftest mismatch-list.20
@@ -144,11 +144,11 @@
   2)
 
 (deftest mismatch-vector.13
-  (mismatch #(1 2 3 4) #(1 2 3 4) :test 'eq)
+  (mismatch #(1 2 3 4) #(1 2 3 4) :test 'eql)
   nil)
 
 (deftest mismatch-vector.14
-  (mismatch #(1 2 3 4) #(5 6 7 8) :test-not 'eq)
+  (mismatch #(1 2 3 4) #(5 6 7 8) :test-not 'eql)
   nil)
 
 (deftest mismatch-vector.15
@@ -168,7 +168,7 @@
   7)
 
 (deftest mismatch-vector.19
-  (mismatch #(1 1 1) #(2 2 2 2 2 1 2 2) :from-end t :test-not 'eq)
+  (mismatch #(1 1 1) #(2 2 2 2 2 1 2 2) :from-end t :test-not 'eql)
   1)
 
 (deftest mismatch-vector.20
@@ -301,7 +301,7 @@
   nil)
 
 (deftest mismatch-bit-vector.11b
-  (mismatch #*0101 #*1010 :key #'evenp :test-not 'eq)
+  (mismatch #*0101 #*1010 :key #'evenp :test-not 'eql)
   nil)
 
 (deftest mismatch-bit-vector.11c
@@ -325,11 +325,11 @@
   2)
 
 (deftest mismatch-bit-vector.13
-  (mismatch #*0001 #*0001 :test 'eq)
+  (mismatch #*0001 #*0001 :test 'eql)
   nil)
 
 (deftest mismatch-bit-vector.14
-  (mismatch '#*10001 #*01110 :test-not 'eq)
+  (mismatch '#*10001 #*01110 :test-not 'eql)
   nil)
 
 (deftest mismatch-bit-vector.15
@@ -349,7 +349,7 @@
   7)
 
 (deftest mismatch-bit-vector.19
-  (mismatch #*000 #*11111011 :from-end t :test-not 'eq)
+  (mismatch #*000 #*11111011 :from-end t :test-not 'eql)
   1)
 
 (deftest mismatch-bit-vector.20
@@ -497,7 +497,7 @@
   nil)
 
 (deftest mismatch-string.11b
-  (mismatch "0101" "1010" :key #'evendigitp :test-not 'eq)
+  (mismatch "0101" "1010" :key #'evendigitp :test-not 'eql)
   nil)
 
 (deftest mismatch-string.11c
@@ -509,7 +509,7 @@
   4)
 
 (deftest mismatch-string.11e
-  (mismatch "0101" '(#\1 #\0 #\1 #\0) :key #'evendigitp :test-not 'eq)
+  (mismatch "0101" '(#\1 #\0 #\1 #\0) :key #'evendigitp :test-not 'eql)
   nil)
 
 (deftest mismatch-string.12
@@ -525,11 +525,11 @@
   2)
 
 (deftest mismatch-string.13
-  (mismatch "0001" "0001" :test 'eq)
+  (mismatch "0001" "0001" :test 'eql)
   nil)
 
 (deftest mismatch-string.14
-  (mismatch "10001" "01110" :test-not 'eq)
+  (mismatch "10001" "01110" :test-not 'eql)
   nil)
 
 (deftest mismatch-string.15
@@ -549,7 +549,7 @@
   7)
 
 (deftest mismatch-string.19
-  (mismatch "000" "11111011" :from-end t :test-not 'eq)
+  (mismatch "000" "11111011" :from-end t :test-not 'eql)
   1)
 
 (deftest mismatch-string.20
diff --git a/ansi-tests/nsubstitute.lsp b/ansi-tests/nsubstitute.lsp
index c751568edb1d0eac5c44d7360423ad9b26895309..fab052abf00860042f3b94f917c616b4e8d3502b 100644
--- a/ansi-tests/nsubstitute.lsp
+++ b/ansi-tests/nsubstitute.lsp
@@ -741,14 +741,14 @@
 (deftest nsubstitute-list.26
   (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eq))))
+	 (result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eql))))
     result)
   ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
 
 (deftest nsubstitute-list.27
   (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eq)))
+	 (result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eql)))
     result)
   ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))    
 
@@ -769,14 +769,14 @@
 (deftest nsubstitute-vector.26
   (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eq))))
+	 (result (nsubstitute '(a 10) 'a x :key #'car :test (complement #'eql))))
     result)
   #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
 
 (deftest nsubstitute-vector.27
   (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eq)))
+	 (result (nsubstitute '(a 10) 'a x :key #'car :test-not #'eql)))
     result)
   #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
 
@@ -797,14 +797,14 @@
 (deftest nsubstitute-string.26
   (let* ((orig "0102342015")
 	 (x (copy-seq orig))
-	 (result (nsubstitute #\a #\1 x :key #'nextdigit :test (complement #'eq))))
+	 (result (nsubstitute #\a #\1 x :key #'nextdigit :test (complement #'eql))))
     result)
   "0a0aaaa0aa")
 
 (deftest nsubstitute-string.27
   (let* ((orig "0102342015")
 	 (x (copy-seq orig))
-	 (result (nsubstitute #\a #\1 x :key #'nextdigit :test-not #'eq)))
+	 (result (nsubstitute #\a #\1 x :key #'nextdigit :test-not #'eql)))
     result)
   "0a0aaaa0aa")
 
diff --git a/ansi-tests/position.lsp b/ansi-tests/position.lsp
index 8e3b9a44090c96599f9d0f7f1ae000976e5ca514..f206c2f3edb655199f86bd7c0e71306ac3e66bd7 100644
--- a/ansi-tests/position.lsp
+++ b/ansi-tests/position.lsp
@@ -82,53 +82,53 @@
   6)
 
 (deftest position-list.14
-  (position 'a '(a a b a c e d a f a) :test (complement #'eq))
+  (position 'a '(a a b a c e d a f a) :test (complement #'eql))
   2)
 
 (deftest position-list.15
-  (position 'a '(a a b a c e d a f a) :test (complement #'eq)
+  (position 'a '(a a b a c e d a f a) :test (complement #'eql)
 	    :from-end t)
   8)
 
 (deftest position-list.16
-  (position 'a '(a a b a c e d a f a) :test-not #'eq)
+  (position 'a '(a a b a c e d a f a) :test-not #'eql)
   2)
 
 (deftest position-list.17
-  (position 'a '(a a b a c e d a f a) :test-not 'eq
+  (position 'a '(a a b a c e d a f a) :test-not 'eql
 	    :from-end t)
   8)
 
 (deftest position-list.18
-  (position 'a '(a a b a c e d a f a) :test-not 'eq)
+  (position 'a '(a a b a c e d a f a) :test-not 'eql)
   2)
 
 (deftest position-list.19
-  (position 'a '(a a b a c e d a f a) :test-not #'eq
+  (position 'a '(a a b a c e d a f a) :test-not #'eql
 	    :from-end t)
   8)
 
 (deftest position-list.20
-  (position 'a '(a a b a c e d a f a) :test-not #'eq)
+  (position 'a '(a a b a c e d a f a) :test-not #'eql)
   2)
 
 (deftest position-list.21
-  (position 'a '(a a b a c e d a f a) :test #'eq
+  (position 'a '(a a b a c e d a f a) :test #'eql
 	    :start 2)
   3)
 
 (deftest position-list.22
-  (position 'a '(a a b a c e d a f a) :test #'eq
+  (position 'a '(a a b a c e d a f a) :test #'eql
 	    :start 2 :end nil)
   3)
 
 (deftest position-list.23
-  (position 'a '(a a b a c e d a f a) :test-not #'eq
+  (position 'a '(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5)
   2)
 
 (deftest position-list.24
-  (position 'a '(a a b a c e d a f a) :test-not #'eq
+  (position 'a '(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   4)
 
@@ -229,53 +229,53 @@
   6)
 
 (deftest position-vector.14
-  (position 'a #(a a b a c e d a f a) :test (complement #'eq))
+  (position 'a #(a a b a c e d a f a) :test (complement #'eql))
   2)
 
 (deftest position-vector.15
-  (position 'a #(a a b a c e d a f a) :test (complement #'eq)
+  (position 'a #(a a b a c e d a f a) :test (complement #'eql)
 	    :from-end t)
   8)
 
 (deftest position-vector.16
-  (position 'a #(a a b a c e d a f a) :test-not #'eq)
+  (position 'a #(a a b a c e d a f a) :test-not #'eql)
   2)
 
 (deftest position-vector.17
-  (position 'a #(a a b a c e d a f a) :test-not 'eq
+  (position 'a #(a a b a c e d a f a) :test-not 'eql
 	    :from-end t)
   8)
 
 (deftest position-vector.18
-  (position 'a #(a a b a c e d a f a) :test-not 'eq)
+  (position 'a #(a a b a c e d a f a) :test-not 'eql)
   2)
 
 (deftest position-vector.19
-  (position 'a #(a a b a c e d a f a) :test-not #'eq
+  (position 'a #(a a b a c e d a f a) :test-not #'eql
 	    :from-end t)
   8)
 
 (deftest position-vector.20
-  (position 'a #(a a b a c e d a f a) :test-not #'eq)
+  (position 'a #(a a b a c e d a f a) :test-not #'eql)
   2)
 
 (deftest position-vector.21
-  (position 'a #(a a b a c e d a f a) :test #'eq
+  (position 'a #(a a b a c e d a f a) :test #'eql
 	    :start 2)
   3)
 
 (deftest position-vector.22
-  (position 'a #(a a b a c e d a f a) :test #'eq
+  (position 'a #(a a b a c e d a f a) :test #'eql
 	    :start 2 :end nil)
   3)
 
 (deftest position-vector.23
-  (position 'a #(a a b a c e d a f a) :test-not #'eq
+  (position 'a #(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5)
   2)
 
 (deftest position-vector.24
-  (position 'a #(a a b a c e d a f a) :test-not #'eq
+  (position 'a #(a a b a c e d a f a) :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   4)
 
@@ -392,53 +392,53 @@
   6)
 
 (deftest position-bit-vector.14
-  (position 0 #*0010111010 :test (complement #'eq))
+  (position 0 #*0010111010 :test (complement #'eql))
   2)
 
 (deftest position-bit-vector.15
-  (position 0 #*0010111010 :test (complement #'eq)
+  (position 0 #*0010111010 :test (complement #'eql)
 	    :from-end t)
   8)
 
 (deftest position-bit-vector.16
-  (position 0 #*0010111010 :test-not #'eq)
+  (position 0 #*0010111010 :test-not #'eql)
   2)
 
 (deftest position-bit-vector.17
-  (position 0 #*001011101 :test-not 'eq
+  (position 0 #*001011101 :test-not 'eql
 	    :from-end t)
   8)
 
 (deftest position-bit-vector.18
-  (position 0 #*00101110 :test-not 'eq)
+  (position 0 #*00101110 :test-not 'eql)
   2)
 
 (deftest position-bit-vector.19
-  (position 0 #*00101110 :test-not #'eq
+  (position 0 #*00101110 :test-not #'eql
 	    :from-end t)
   6)
 
 (deftest position-bit-vector.20
-  (position 0 #*00101110 :test-not #'eq)
+  (position 0 #*00101110 :test-not #'eql)
   2)
 
 (deftest position-bit-vector.21
-  (position 0 #*00101110 :test #'eq
+  (position 0 #*00101110 :test #'eql
 	    :start 2)
   3)
 
 (deftest position-bit-vector.22
-  (position 0 #*00101110 :test #'eq
+  (position 0 #*00101110 :test #'eql
 	    :start 2 :end nil)
   3)
 
 (deftest position-bit-vector.23
-  (position 0 #*00101110 :test-not #'eq
+  (position 0 #*00101110 :test-not #'eql
 	    :start 0 :end 5)
   2)
 
 (deftest position-bit-vector.24
-  (position 0 #*00101110 :test-not #'eq
+  (position 0 #*00101110 :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   4)
 
@@ -562,53 +562,53 @@
   6)
 
 (deftest position-string.14
-  (position #\a "aabacedafa" :test (complement #'eq))
+  (position #\a "aabacedafa" :test (complement #'eql))
   2)
 
 (deftest position-string.15
-  (position #\a "aabacedafa" :test (complement #'eq)
+  (position #\a "aabacedafa" :test (complement #'eql)
 	    :from-end t)
   8)
 
 (deftest position-string.16
-  (position #\a "aabacedafa" :test-not #'eq)
+  (position #\a "aabacedafa" :test-not #'eql)
   2)
 
 (deftest position-string.17
-  (position #\a "aabacedafa" :test-not 'eq
+  (position #\a "aabacedafa" :test-not 'eql
 	    :from-end t)
   8)
 
 (deftest position-string.18
-  (position #\a "aabacedafa" :test-not 'eq)
+  (position #\a "aabacedafa" :test-not 'eql)
   2)
 
 (deftest position-string.19
-  (position #\a "aabacedafa" :test-not #'eq
+  (position #\a "aabacedafa" :test-not #'eql
 	    :from-end t)
   8)
 
 (deftest position-string.20
-  (position #\a "aabacedafa" :test-not #'eq)
+  (position #\a "aabacedafa" :test-not #'eql)
   2)
 
 (deftest position-string.21
-  (position #\a "aabacedafa" :test #'eq
+  (position #\a "aabacedafa" :test #'eql
 	    :start 2)
   3)
 
 (deftest position-string.22
-  (position #\a "aabacedafa" :test #'eq
+  (position #\a "aabacedafa" :test #'eql
 	    :start 2 :end nil)
   3)
 
 (deftest position-string.23
-  (position #\a "aabacedafa" :test-not #'eq
+  (position #\a "aabacedafa" :test-not #'eql
 	    :start 0 :end 5)
   2)
 
 (deftest position-string.24
-  (position #\a "aabacedafa" :test-not #'eq
+  (position #\a "aabacedafa" :test-not #'eql
 	    :start 0 :end 5 :from-end t)
   4)
 
diff --git a/ansi-tests/search-bitvector.lsp b/ansi-tests/search-bitvector.lsp
index 816bfb6cf50f5d9f1d6423d94c2169168fecb6a6..408081210a97c9405ba3d7183a1bf010e0c14ca9 100644
--- a/ansi-tests/search-bitvector.lsp
+++ b/ansi-tests/search-bitvector.lsp
@@ -104,18 +104,18 @@
 (deftest search-bitvector.11
   (let ((target *searched-bitvector*))
     (loop for pat in *pattern-subbitvectors*
-	  for pos = (search pat target :start2 20 :test (complement #'eq))
+	  for pos = (search pat target :start2 20 :test (complement #'eql))
 	  unless (search-check pat target pos :start2 20
-			       :test (complement #'eq))
+			       :test (complement #'eql))
 	  collect pat))
   nil)
 
 (deftest search-bitvector.12
   (let ((target *searched-bitvector*))
     (loop for pat in *pattern-subbitvectors*
-	  for pos = (search pat target :from-end t :start2 20 :test-not #'eq)
+	  for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
 	  unless (search-check pat target pos :from-end t
-			       :start2 20 :test (complement #'eq))
+			       :start2 20 :test (complement #'eql))
 	  collect pat))
   nil)
 
@@ -124,10 +124,10 @@
     (loop for pat in *pattern-subbitvectors*
 	  when (and (> (length pat) 0)
 		    (let ((pos (search pat target :start1 1
-				       :test (complement #'eq))))
+				       :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :start1 1
-					 :test (complement #'eq)))))
+					 :test (complement #'eql)))))
 	  collect pat))
   nil)
 
@@ -137,10 +137,10 @@
 	  when (let ((len (length pat)))
 		 (and (> len 0)
 		      (let ((pos (search pat target :end1 (1- len)
-					 :test (complement #'eq))))
+					 :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :end1 (1- len)
-					 :test (complement #'eq))))))
+					 :test (complement #'eql))))))
 	  collect pat))
   nil)
 
diff --git a/ansi-tests/search-list.lsp b/ansi-tests/search-list.lsp
index a0cd66e19d967ce8003e7073a8737d76d32f2f20..9f810642ed84c2317082dec1d6d88278f91eaa49 100644
--- a/ansi-tests/search-list.lsp
+++ b/ansi-tests/search-list.lsp
@@ -94,18 +94,18 @@
 (deftest search-list.11
   (let ((target *searched-list*))
     (loop for pat in *pattern-sublists*
-	  for pos = (search pat target :start2 20 :test (complement #'eq))
+	  for pos = (search pat target :start2 20 :test (complement #'eql))
 	  unless (search-check pat target pos :start2 20
-			       :test (complement #'eq))
+			       :test (complement #'eql))
 	  collect pat))
   nil)
 
 (deftest search-list.12
   (let ((target *searched-list*))
     (loop for pat in *pattern-sublists*
-	  for pos = (search pat target :from-end t :start2 20 :test-not #'eq)
+	  for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
 	  unless (search-check pat target pos :from-end t
-			       :start2 20 :test (complement #'eq))
+			       :start2 20 :test (complement #'eql))
 	  collect pat))
   nil)
 
@@ -114,10 +114,10 @@
     (loop for pat in *pattern-sublists*
 	  when (and (> (length pat) 0)
 		    (let ((pos (search pat target :start1 1
-				       :test (complement #'eq))))
+				       :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :start1 1
-					 :test (complement #'eq)))))
+					 :test (complement #'eql)))))
 	  collect pat))
   nil)
 
@@ -127,10 +127,10 @@
 	  when (let ((len (length pat)))
 		 (and (> len 0)
 		      (let ((pos (search pat target :end1 (1- len)
-					 :test (complement #'eq))))
+					 :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :end1 (1- len)
-					 :test (complement #'eq))))))
+					 :test (complement #'eql))))))
 	  collect pat))
   nil)
 
@@ -212,7 +212,7 @@
       :start2 (progn (setf f (incf i)) 1)
       :end2 (progn (setf g (incf i)) 8)
       :key (progn (setf h (incf i)) #'identity)
-      :test (progn (setf j (incf i)) #'eq)
+      :test (progn (setf j (incf i)) #'eql)
       )
      i a b c d e f g h j))
   4 9 1 2 3 4 5 6 7 8 9)
@@ -223,7 +223,7 @@
      (search
       (progn (setf a (incf i)) '(nil a b nil))
       (progn (setf b (incf i)) '(z z z a a b b z z z))
-      :test-not (progn (setf c (incf i)) (complement #'eq))
+      :test-not (progn (setf c (incf i)) (complement #'eql))
       :key (progn (setf d (incf i)) #'identity)
       :end2 (progn (setf e (incf i)) 8)
       :start2 (progn (setf f (incf i)) 1)
diff --git a/ansi-tests/search-string.lsp b/ansi-tests/search-string.lsp
index 7a9af742f7d6ba4c96b0a57bfc12a92d31d94533..243af8dfaf56984015ba4aad84cb7036e03b814d 100644
--- a/ansi-tests/search-string.lsp
+++ b/ansi-tests/search-string.lsp
@@ -91,18 +91,18 @@
 (deftest search-string.10
   (let ((target *searched-string*))
     (loop for pat in *pattern-substrings*
-	  for pos = (search pat target :start2 20 :test (complement #'eq))
+	  for pos = (search pat target :start2 20 :test (complement #'eql))
 	  unless (search-check pat target pos :start2 20
-			       :test (complement #'eq))
+			       :test (complement #'eql))
 	  collect pat))
   nil)
 
 (deftest search-string.11
   (let ((target *searched-string*))
     (loop for pat in *pattern-substrings*
-	  for pos = (search pat target :from-end t :start2 20 :test-not #'eq)
+	  for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
 	  unless (search-check pat target pos :from-end t
-			       :start2 20 :test (complement #'eq))
+			       :start2 20 :test (complement #'eql))
 	  collect pat))
   nil)
 
@@ -111,10 +111,10 @@
     (loop for pat in *pattern-substrings*
 	  when (and (> (length pat) 0)
 		    (let ((pos (search pat target :start1 1
-				       :test (complement #'eq))))
+				       :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :start1 1
-					 :test (complement #'eq)))))
+					 :test (complement #'eql)))))
 	  collect pat))
   nil)
 
@@ -124,10 +124,10 @@
 	  when (let ((len (length pat)))
 		 (and (> len 0)
 		      (let ((pos (search pat target :end1 (1- len)
-					 :test (complement #'eq))))
+					 :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :end1 (1- len)
-					 :test (complement #'eq))))))
+					 :test (complement #'eql))))))
 	  collect pat))
   nil)
 
diff --git a/ansi-tests/search-vector.lsp b/ansi-tests/search-vector.lsp
index 576fa934911b0370e02193b6603e696b97e0db53..6be7d0b3d244fb5449098502f57908721efaa307 100644
--- a/ansi-tests/search-vector.lsp
+++ b/ansi-tests/search-vector.lsp
@@ -106,18 +106,18 @@
 (deftest search-vector.11
   (let ((target *searched-vector*))
     (loop for pat in *pattern-subvectors*
-	  for pos = (search pat target :start2 20 :test (complement #'eq))
+	  for pos = (search pat target :start2 20 :test (complement #'eql))
 	  unless (search-check pat target pos :start2 20
-			       :test (complement #'eq))
+			       :test (complement #'eql))
 	  collect pat))
   nil)
 
 (deftest search-vector.12
   (let ((target *searched-vector*))
     (loop for pat in *pattern-subvectors*
-	  for pos = (search pat target :from-end t :start2 20 :test-not #'eq)
+	  for pos = (search pat target :from-end t :start2 20 :test-not #'eql)
 	  unless (search-check pat target pos :from-end t
-			       :start2 20 :test (complement #'eq))
+			       :start2 20 :test (complement #'eql))
 	  collect pat))
   nil)
 
@@ -126,10 +126,10 @@
     (loop for pat in *pattern-subvectors*
 	  when (and (> (length pat) 0)
 		    (let ((pos (search pat target :start1 1
-				       :test (complement #'eq))))
+				       :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :start1 1
-					 :test (complement #'eq)))))
+					 :test (complement #'eql)))))
 	  collect pat))
   nil)
 
@@ -139,10 +139,10 @@
 	  when (let ((len (length pat)))
 		 (and (> len 0)
 		      (let ((pos (search pat target :end1 (1- len)
-					 :test (complement #'eq))))
+					 :test (complement #'eql))))
 		      (not (search-check pat target pos
 					 :end1 (1- len)
-					 :test (complement #'eq))))))
+					 :test (complement #'eql))))))
 	  collect pat))
   nil)
 
diff --git a/ansi-tests/substitute.lsp b/ansi-tests/substitute.lsp
index 149edb57001145de1999d3893b0d7c48bbb1632f..3ec0ed2c69722f8c64c4bb9f96d3259daf401cb9 100644
--- a/ansi-tests/substitute.lsp
+++ b/ansi-tests/substitute.lsp
@@ -190,7 +190,7 @@
 (deftest substitute-list.26
   (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (substitute '(a 10) 'a x :key #'car :test (complement #'eq))))
+	 (result (substitute '(a 10) 'a x :key #'car :test (complement #'eql))))
     (and (equal orig x)
 	 result))
   ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
@@ -198,7 +198,7 @@
 (deftest substitute-list.27
   (let* ((orig '((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (substitute '(a 10) 'a x :key #'car :test-not #'eq)))
+	 (result (substitute '(a 10) 'a x :key #'car :test-not #'eql)))
     (and (equal orig x)
 	 result))
   ((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))    
@@ -394,7 +394,7 @@
 (deftest substitute-vector.26
   (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (substitute '(a 10) 'a x :key #'car :test (complement #'eq))))
+	 (result (substitute '(a 10) 'a x :key #'car :test (complement #'eql))))
     (and (equalp orig x)
 	 result))
   #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
@@ -402,7 +402,7 @@
 (deftest substitute-vector.27
   (let* ((orig #((a 1) (b 2) (a 3) (c 4) (d 5) (a 6) (e 7)))
 	 (x (copy-seq orig))
-	 (result (substitute '(a 10) 'a x :key #'car :test-not #'eq)))
+	 (result (substitute '(a 10) 'a x :key #'car :test-not #'eql)))
     (and (equalp orig x)
 	 result))
   #((a 1) (a 10) (a 3) (a 10) (a 10) (a 6) (a 10)))
@@ -641,7 +641,7 @@
 (deftest substitute-string.26
   (let* ((orig "0102342015")
 	 (x (copy-seq orig))
-	 (result (substitute #\a #\1 x :key #'nextdigit :test (complement #'eq))))
+	 (result (substitute #\a #\1 x :key #'nextdigit :test (complement #'eql))))
     (and (equalp orig x)
 	 result))
   "0a0aaaa0aa")
@@ -649,7 +649,7 @@
 (deftest substitute-string.27
   (let* ((orig "0102342015")
 	 (x (copy-seq orig))
-	 (result (substitute #\a #\1 x :key #'nextdigit :test-not #'eq)))
+	 (result (substitute #\a #\1 x :key #'nextdigit :test-not #'eql)))
     (and (equalp orig x)
 	 result))
    "0a0aaaa0aa")
@@ -925,7 +925,7 @@
 (deftest substitute-bit-vector.28
   (let* ((orig #*00111001011010110)
 	 (x (copy-seq orig))
-	 (result (substitute 0 1 x :key #'1+ :test (complement #'eq))))
+	 (result (substitute 0 1 x :key #'1+ :test (complement #'eql))))
     (and (equalp orig x)
 	 result))
   #*00000000000000000)
@@ -933,7 +933,7 @@
 (deftest substitute-bit-vector.29
   (let* ((orig #*00111001011010110)
 	 (x (copy-seq orig))
-	 (result (substitute 0 1 x :key #'1+ :test-not #'eq)))
+	 (result (substitute 0 1 x :key #'1+ :test-not #'eql)))
     (and (equalp orig x)
 	 result))
   #*00000000000000000)