diff --git a/examples/ChangeLog b/examples/ChangeLog
index 076c547ad..062f0f756 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-16  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
+
+	* modules/check.test, safe/check.test: New files.
+
+	* modules/Makefile.am (TESTS), safe/Makefile.am (TESTS): New
+	variables.
+
 2001-07-14  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* scripts/check.test: New file.
diff --git a/examples/modules/Makefile.am b/examples/modules/Makefile.am
index 35988c545..4f0bd0437 100644
--- a/examples/modules/Makefile.am
+++ b/examples/modules/Makefile.am
@@ -20,3 +20,5 @@
 ##   330, Boston, MA 02111-1307 USA
 
 EXTRA_DIST = README module-0.scm module-1.scm module-2.scm main
+
+TESTS = check.test
diff --git a/examples/modules/check.test b/examples/modules/check.test
new file mode 100755
index 000000000..394920306
--- /dev/null
+++ b/examples/modules/check.test
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# must be run from this directory
+guile=${GUILE-../../libguile/guile}
+
+set -e
+
+#
+# ./safe untrusted.scm
+#
+$guile -s main > TMP
+cat <<EOF | diff -u - TMP
+module-0 foo
+module-0 bar
+module-1 foo
+module-1 bar
+module-2 braz
+module-2 braz
+module-2 foo
+EOF
+rm -f TMP
+
+# check.test ends here
diff --git a/examples/safe/Makefile.am b/examples/safe/Makefile.am
index cf41df73f..254e139cc 100644
--- a/examples/safe/Makefile.am
+++ b/examples/safe/Makefile.am
@@ -20,3 +20,5 @@
 ##   330, Boston, MA 02111-1307 USA
 
 EXTRA_DIST = README safe untrusted.scm evil.scm
+
+TESTS = check.test
diff --git a/examples/safe/check.test b/examples/safe/check.test
new file mode 100755
index 000000000..66525175a
--- /dev/null
+++ b/examples/safe/check.test
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# must be run from this directory
+guile=${GUILE-../../libguile/guile}
+
+set -e
+
+#
+# ./safe untrusted.scm
+#
+$guile -s safe untrusted.scm > TMP
+cat <<EOF | diff -u - TMP
+1
+1
+2
+6
+24
+120
+720
+5040
+40320
+362880
+3628800
+EOF
+rm -f TMP
+
+#
+# ./safe evil.scm
+#
+$guile -s safe evil.scm > TMP
+cat <<EOF | diff -u - TMP
+** Exception: (unbound-variable #f "Unbound variable: ~S" (open-input-file) #f)
+EOF
+rm -f TMP
+
+# check.test ends here