diff --git a/guix/self.scm b/guix/self.scm
index fea5db5da3..d1b8256802 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -621,16 +621,6 @@ Info manual."
                  #:guile-for-build
                  guile-for-build))
 
-  (define *system-test-modules*
-    ;; Ship these modules mostly so (gnu ci) can refer to them.
-    (scheme-node "guix-system-tests"
-                 `((gnu tests)
-                   ,@(scheme-modules* source "gnu/tests"))
-                 (list *core-package-modules* *package-modules*
-                       *extra-modules* *system-modules* *core-modules*)
-                 #:extensions dependencies
-                 #:guile-for-build guile-for-build))
-
   (define *cli-modules*
     (scheme-node "guix-cli"
                  (append (scheme-modules* source "/guix/scripts")
@@ -641,6 +631,17 @@ Info manual."
                  #:extensions dependencies
                  #:guile-for-build guile-for-build))
 
+  (define *system-test-modules*
+    ;; Ship these modules mostly so (gnu ci) can discover them.
+    (scheme-node "guix-system-tests"
+                 `((gnu tests)
+                   ,@(scheme-modules* source "gnu/tests"))
+                 (list *core-package-modules* *package-modules*
+                       *extra-modules* *system-modules* *core-modules*
+                       *cli-modules*)           ;for (guix scripts pack), etc.
+                 #:extensions dependencies
+                 #:guile-for-build guile-for-build))
+
   (define *config*
     (scheme-node "guix-config"
                  '()