diff --git a/mes/module/mes/boot-5.mes b/mes/module/mes/boot-5.mes
index 48b56991..8c13b179 100644
--- a/mes/module/mes/boot-5.mes
+++ b/mes/module/mes/boot-5.mes
@@ -183,6 +183,7 @@
 (mes-use-module (mes main))
 
 (mes-use-module (srfi srfi-9))
+(mes-use-module (mes syntax))
 (mes-use-module (mes boot-6))
 (top-main)
 (primitive-load 0)
diff --git a/mes/module/mes/pmatch.mes b/mes/module/mes/pmatch.mes
deleted file mode 100644
index 1ee8b0ee..00000000
--- a/mes/module/mes/pmatch.mes
+++ /dev/null
@@ -1,28 +0,0 @@
-;;; -*-scheme-*-
-
-;;; GNU Mes --- Maxwell Equations of Software
-;;; Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
-;;;
-;;; This file is part of GNU Mes.
-;;;
-;;; GNU Mes 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 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Mes 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 GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-;;(mes-use-module (mes guile))
-(mes-use-module (mes quasiquote))
-(mes-use-module (mes syntax))
-(include-from-path "system/base/pmatch.scm")
diff --git a/tests/pmatch.test b/tests/pmatch.test
index 3f76f119..b95e8bb5 100755
--- a/tests/pmatch.test
+++ b/tests/pmatch.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 pmatch)' -s "$0" "$@"
 !#
 
@@ -26,15 +28,8 @@ exec ${MES-bin/mes} --no-auto-compile -L ${0%/*} -L module -C module -e '(tests
 (define-module (tests pmatch)
   #:use-module (system base pmatch)
   #:use-module (mes mes-0)
-  #:use-module (mes guile)
   #:use-module (mes test))
 
-(cond-expand
- (mes
-  (mes-use-module (mes test))
-  (mes-use-module (mes pmatch)))
- (else))
-
 (pass-if "first dummy" #t)
 (pass-if-not "second dummy" #f)