diff --git a/ansi-tests/fboundp.lsp b/ansi-tests/fboundp.lsp
index 220fa1592d93ac994d589dceac8d1f030af77a52..43cc14e9521880fe18fdf414fa9a76cc39f42c4c 100644
--- a/ansi-tests/fboundp.lsp
+++ b/ansi-tests/fboundp.lsp
@@ -39,9 +39,20 @@
   (let ((g (gensym))) (fboundp (list 'setf g)))
   nil)
 
+(deftest fboundp.8
+  (catch-type-error (fboundp 1))
+  type-error)
+
+(deftest fboundp.9
+  (catch-type-error (fboundp #\a))
+  type-error)
+
+(deftest fboundp.10
+  (catch-type-error (fboundp '(foo)))
+  type-error)
+
 
 
-  
 
 
   
diff --git a/ansi-tests/fmakunbound.lsp b/ansi-tests/fmakunbound.lsp
new file mode 100644
index 0000000000000000000000000000000000000000..6b46ac73492109ba4f7bd2f517fce69234255b27
--- /dev/null
+++ b/ansi-tests/fmakunbound.lsp
@@ -0,0 +1,56 @@
+;-*- Mode:     Lisp -*-
+;;;; Author:   Paul Dietz
+;;;; Created:  Tue Oct  8 00:09:14 2002
+;;;; Contains: Tests for FMAKUNBOUND
+
+(in-package :cl-test)
+
+(deftest fmakunbound.1
+  (let ((g (gensym)))
+    (and (not (fboundp g))
+	 (setf (symbol-function g) #'car)
+	 (fboundp g)
+	 (values (eq (fmakunbound g) g)
+		 (fboundp g))))
+  t nil)
+
+(deftest fmakunbound.2
+  (let ((g (gensym)))
+    (and (not (fboundp g))
+	 (eval `(defun ,g () nil))
+	 (fboundp g)
+	 (values (eq (fmakunbound g) g)
+		 (fboundp g))))
+  t nil)
+
+(deftest fmakunbound.3
+  (let ((g (gensym)))
+    (and (not (fboundp g))
+	 (eval `(defmacro ,g () nil))
+	 (fboundp g)
+	 (values (eq (fmakunbound g) g)
+		 (fboundp g))))
+  t nil)
+
+(deftest fmakunbound.4
+  (let* ((g (gensym))
+	 (n `(setf ,g)))
+    (and (not (fboundp n))
+	 (eval `(defun ,n () nil))
+	 (fboundp n)
+	 (values (equal (fmakunbound n) n)
+		 (fboundp n))))
+  t nil)
+
+(deftest fmakunbound.5
+  (catch-type-error (fmakunbound 1))
+  type-error)
+
+(deftest fmakunbound.6
+  (catch-type-error (fmakunbound #\a))
+  type-error)
+
+(deftest fmakunbound.7
+  (catch-type-error (fmakunbound '(x)))
+  type-error)
+
diff --git a/ansi-tests/gclload2.lsp b/ansi-tests/gclload2.lsp
index d0b63beeee522cafab53e510d1c1f54726b5373a..1daa7411fae36a22beca6d52a7a5fa8e80211055 100644
--- a/ansi-tests/gclload2.lsp
+++ b/ansi-tests/gclload2.lsp
@@ -9,6 +9,7 @@
 (load "constantly.lsp")
 (load "complement.lsp")
 (load "fboundp.lsp")
+(load "fmakunbound.lsp")
 (load "function.lsp")
 (load "functionp.lsp")
 (load "lambda-list-keywords.lsp")