diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 019e21fd39..941958d698 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -957,7 +957,7 @@ build (current-guix) and then store a couple of full system images.")
 
 (define* (gui-test-program marionette
                            #:key
-                           (desktop? #f)
+                           (desktops '())
                            (encrypted? #f))
   #~(let ()
       (define (screenshot file)
@@ -971,7 +971,9 @@ build (current-guix) and then store a couple of full system images.")
       (setvbuf (current-output-port) 'none)
       (setvbuf (current-error-port) 'none)
 
-      (marionette-eval* '(use-modules (gnu installer tests))
+      (marionette-eval* '(use-modules (gnu installer tests)
+                                      (srfi srfi-1)
+                                      (srfi srfi-26))
                         #$marionette)
 
       ;; Arrange so that 'converse' prints debugging output to the console.
@@ -1016,7 +1018,9 @@ build (current-guix) and then store a couple of full system images.")
 
       (marionette-eval* '(choose-services installer-socket
                                           #:choose-desktop-environment?
-                                          (const #$desktop?)
+                                          (lambda (desktop)
+                                            (any (cut string-contains desktop <>)
+                                                 '#$desktops))
                                           #:choose-network-service?
                                           (const #f))
                         #$marionette)
@@ -1110,7 +1114,7 @@ build (current-guix) and then store a couple of full system images.")
 
 (define* (guided-installation-test name
                                    #:key
-                                   (desktop? #f)
+                                   (desktops '())
                                    (encrypted? #f)
                                    target-os
                                    (install-size 'guess)
@@ -1132,7 +1136,7 @@ build (current-guix) and then store a couple of full system images.")
                                (lambda (marionette)
                                  (gui-test-program
                                   marionette
-                                  #:desktop? desktop?
+                                  #:desktops desktops
                                   #:encrypted? encrypted?))))
          (command (qemu-command/writable-image image)))
       (run-basic-test target-os command name
@@ -1155,7 +1159,7 @@ build (current-guix) and then store a couple of full system images.")
 ;; desktop environments in a single test to reduce the overhead.
 (define %test-gui-installed-desktop-os-encrypted
   (guided-installation-test "gui-installed-desktop-os-encrypted"
-                            #:desktop? #t
+                            #:desktops '("GNOME")
                             #:encrypted? #t
                             #:target-os
                             (installation-target-desktop-os-for-gui-tests