diff --git a/testsuite/t-match.scm b/testsuite/t-match.scm
index ed9d6f488..4b85f30d3 100644
--- a/testsuite/t-match.scm
+++ b/testsuite/t-match.scm
@@ -1,9 +1,8 @@
 ;;; Pattern matching with `(ice-9 match)'.
 ;;;
 
-;; Both modules are compile-time dependencies, hence `use-syntax'.
-(use-syntax (ice-9 match))
-(use-syntax (srfi srfi-9))  ;; record type (FIXME: See `t-records.scm')
+(use-modules (ice-9 match)
+             (srfi srfi-9))  ;; record type (FIXME: See `t-records.scm')
 
 (define-record-type <stuff>
   (%make-stuff chbouib)
diff --git a/testsuite/t-records.scm b/testsuite/t-records.scm
index 243e9d97e..0cb320da3 100644
--- a/testsuite/t-records.scm
+++ b/testsuite/t-records.scm
@@ -1,17 +1,7 @@
 ;;; SRFI-9 Records.
 ;;;
 
-;; SRFI-9 is a compile-time dependency (it exports the `define-record-type'
-;; macro), hence the `use-syntax'.
-;;
-;; FIXME: The current definition of `use-syntax' in `boot-9.scm' is broken
-;; and is not consistent with what happens when using:
-;;
-;;  (define-module (module) :use-syntax (chbouib))
-;;
-;; This precludes the test-suite from running this program using the
-;; interpreter.
-(use-syntax (srfi srfi-9))
+(use-modules (srfi srfi-9))
 
 (define-record-type <stuff>
   (%make-stuff chbouib)