diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index d604ff555..624cd2160 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-21  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* tests/eval.test:  Added.
+
 2000-06-16  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* tests/list.test:  Use cons* instead of list*.
diff --git a/test-suite/tests/eval.test b/test-suite/tests/eval.test
new file mode 100644
index 000000000..cdc69ef62
--- /dev/null
+++ b/test-suite/tests/eval.test
@@ -0,0 +1,137 @@
+;;;; eval.test --- tests guile's evaluator     -*- scheme -*-
+;;;; Copyright (C) 2000 Free Software Foundation, Inc.
+;;;;
+;;;; This program is free software; you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this software; see the file COPYING.  If not, write to
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
+;;;;
+;;;; As a special exception, the Free Software Foundation gives permission
+;;;; for additional uses of the text contained in its release of GUILE.
+;;;;
+;;;; The exception is that, if you link the GUILE library with other files
+;;;; to produce an executable, this does not by itself cause the
+;;;; resulting executable to be covered by the GNU General Public License.
+;;;; Your use of that executable is in no way restricted on account of
+;;;; linking the GUILE library code into it.
+;;;;
+;;;; This exception does not however invalidate any other reasons why
+;;;; the executable file might be covered by the GNU General Public License.
+;;;;
+;;;; This exception applies only to the code released by the
+;;;; Free Software Foundation under the name GUILE.  If you copy
+;;;; code from other Free Software Foundation releases into a copy of
+;;;; GUILE, as the General Public License permits, the exception does
+;;;; not apply to the code that you add in this way.  To avoid misleading
+;;;; anyone as to the status of such modified files, you must delete
+;;;; this exception notice from them.
+;;;;
+;;;; If you write modifications of your own for GUILE, it is your choice
+;;;; whether to permit this exception to apply to your modifications.
+;;;; If you do not wish that, delete this exception notice.
+
+(use-modules (ice-9 documentation))
+
+
+;;;
+;;; miscellaneous
+;;;
+
+
+(define (documented? object)
+  (object-documentation object))
+
+
+;;;
+;;; eval
+;;;
+
+(with-test-prefix "evaluator"
+
+  (with-test-prefix "parameter error"
+
+    ;; This is currently a bug in guile:
+    ;; Macros are accepted as function parameters.
+    ;; Functions that 'apply' macros are rewritten!!!
+
+    (expect-fail "macro as argument"
+      (let ((f (lambda (p a b) (p a b))))
+	(catch 'wrong-type-arg
+	  (lambda ()
+	    (f and #t #t)
+	    #f)
+	  (lambda (key . args)
+	    #t))))
+
+    (expect-fail "application of macro"
+      (let ((f (lambda (p a b) (p a b))))
+	(catch 'wrong-type-arg
+	  (lambda ()
+            (let ((foo (procedure-source f)))
+	      (f and #t #t)
+	      (equal? (procedure-source f) foo)))
+	  (lambda (key . args)
+	    #t))))
+
+    ))
+
+;;;
+;;; map
+;;;
+
+(with-test-prefix "map"
+
+  ;; Is documentation available?
+
+  (expect-fail "documented?"
+    (documented? 'map))
+
+  (with-test-prefix "argument error"
+
+    (with-test-prefix "non list argument"
+      #t)
+
+    (with-test-prefix "different length lists"
+
+      (pass-if "first list empty"
+	(catch 'out-of-range
+	  (lambda ()
+	    (map + '() '(1))
+	    #f)
+	  (lambda (key . args)
+	    #t)))
+
+      (pass-if "second list empty"
+	(catch 'out-of-range
+	  (lambda ()
+	    (map + '(1) '())
+	    #f)
+	  (lambda (key . args)
+	    #t)))
+
+      (pass-if "first list shorter"
+	(catch 'out-of-range
+	  (lambda ()
+	    (map + '(1) '(2 3))
+	    #f)
+	  (lambda (key . args)
+	    #t)))
+
+      (pass-if "second list shorter"
+	(catch 'out-of-range
+	  (lambda ()
+	    (map + '(1 2) '(3))
+	    #f)
+	  (lambda (key . args)
+	    #t)))
+    )))