diff --git a/mes/module/mes/guile.mes b/mes/module/mes/guile.mes
index ec5c880b..e2bd3666 100644
--- a/mes/module/mes/guile.mes
+++ b/mes/module/mes/guile.mes
@@ -44,6 +44,9 @@
 (define-macro (defmacro name args . body)
   `(define-macro ,(cons name args) ,@body))
 
+(define-macro (set-object-property! object key value)
+  object)
+
 (define-macro (set-procedure-property! proc key value)
   proc)
 
diff --git a/tests/catch.test b/tests/catch.test
index a4510369..6861086e 100755
--- a/tests/catch.test
+++ b/tests/catch.test
@@ -1,12 +1,14 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests catch)' -s "$0" "$@"
 !#
 
 ;;; -*-scheme-*-
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@@ -24,12 +26,8 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 ;;; along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (tests base)
-  #:use-module (mes mes-0)
   #:use-module (mes test))
 
-(mes-use-module (mes catch))
-(mes-use-module (mes test))
-
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)
 
diff --git a/tests/closure.test b/tests/closure.test
index 36d001ab..3a36d436 100755
--- a/tests/closure.test
+++ b/tests/closure.test
@@ -1,12 +1,14 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests closure)' -s "$0" "$@"
 !#
 
 ;;; -*-scheme-*-
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@@ -24,11 +26,8 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 ;;; along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (tests closure)
-  #:use-module (mes mes-0)
   #:use-module (mes test))
 
-(mes-use-module (mes test))
-
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)
 
diff --git a/tests/cwv.test b/tests/cwv.test
index b58c6e60..05c9f011 100755
--- a/tests/cwv.test
+++ b/tests/cwv.test
@@ -1,12 +1,14 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests cwv)' -s "$0" "$@"
 !#
 
 ;;; -*-scheme-*-
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@@ -27,9 +29,6 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
   #:use-module (mes mes-0)
   #:use-module (mes test))
 
-(mes-use-module (mes scm))
-(mes-use-module (mes test))
-
 (if (not guile-1.8?)
     (pass-if "values" (seq? (values 0 1) 0)))
 (if (not guile-1.8?)
diff --git a/tests/display.test b/tests/display.test
index e17e8ab9..e932cd63 100755
--- a/tests/display.test
+++ b/tests/display.test
@@ -1,11 +1,14 @@
 #! /bin/sh
+# -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests display)' -s "$0" "$@"
 !#
 
 ;;; -*-scheme-*-
 
 ;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016,2018,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Mes.
 ;;;
@@ -26,10 +29,6 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
   #:use-module (mes mes-0)
   #:use-module (mes test))
 
-(mes-use-module (mes display))
-(mes-use-module (mes guile))
-(mes-use-module (mes test))
-
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)
 
diff --git a/tests/guile.test b/tests/guile.test
index 5804ee2f..1ec3989c 100755
--- a/tests/guile.test
+++ b/tests/guile.test
@@ -1,5 +1,7 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests guile)' -s "$0" "$@"
 !#
 
@@ -26,15 +28,8 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 (define-module (tests guile)
   #:use-module (ice-9 rdelim)
   #:use-module (mes mes-0)
-  #:use-module (mes misc)
   #:use-module (mes test))
 
-(cond-expand
- (mes
-  (mes-use-module (mes test))
-  (mes-use-module (mes guile)))
- (else))
-
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)
 
diff --git a/tests/match.test b/tests/match.test
index 83ee16a2..3d2d5f4f 100755
--- a/tests/match.test
+++ b/tests/match.test
@@ -1,5 +1,7 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests match)' -s "$0" "$@"
 !#
 
diff --git a/tests/math.test b/tests/math.test
index 157b55e5..ee23962a 100755
--- a/tests/math.test
+++ b/tests/math.test
@@ -1,5 +1,7 @@
 #! /bin/sh
 # -*-scheme-*-
+MES_BOOT=boot-5.mes
+export MES_BOOT
 exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests math)' -s "$0" "$@"
 !#
 
@@ -24,10 +26,8 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 ;;; along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (tests math)
-  #:use-module (mes mes-0)
   #:use-module (mes test))
 
-(mes-use-module (mes test))
 (pass-if-equal "string->number" 42 (string->number "42"))
 (pass-if-equal "string->number neg" -42 (string->number "-42"))
 (pass-if-equal "string->number #hex" 170 (string->number "#xaa"))