diff --git a/tests/base.scm b/tests/base.scm
index f902da2..1cfbecb 100644
--- a/tests/base.scm
+++ b/tests/base.scm
@@ -19,6 +19,10 @@
 (use-modules (cuirass base)
              (srfi srfi-64))
 
+(test-begin "base")
+
 (test-error "invalid cache directory"
   'wrong-type-arg
   (%package-cachedir #f))
+
+(test-end)
diff --git a/tests/database.scm b/tests/database.scm
index 7fa9f1b..eecef8b 100644
--- a/tests/database.scm
+++ b/tests/database.scm
@@ -45,6 +45,8 @@
   ;; Global Slot for a job ID in the database.
   (make-parameter #t))
 
+(test-begin "database")
+
 (parameterize
     ((%package-database
       ;; Use an empty and temporary database for the tests.
@@ -84,3 +86,5 @@
         (db-close (%db))))
     (λ ()
       (delete-file (%package-database)))))
+
+(test-end)
diff --git a/tests/ui.scm b/tests/ui.scm
index 34b1ffd..62e1432 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -19,6 +19,10 @@
 (use-modules (cuirass ui)
              (srfi srfi-64))
 
+(test-begin "ui")
+
 (test-error "invalid program name"
   'wrong-type-arg
   (%program-name #f))
+
+(test-end)
diff --git a/tests/utils.scm b/tests/utils.scm
index 4b9d767..496cbee 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -23,6 +23,8 @@
 (define dir-1 (make-parameter ""))
 (define dir-2 (make-parameter ""))
 
+(test-begin "utils")
+
 (test-assert "with-directory-excursion"
   (let ((old (getcwd))
         (tmp (tmpnam)))
@@ -37,3 +39,5 @@
              (string=? (dir-2) old)))
       (λ ()
         (rmdir tmp)))))
+
+(test-end)