diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db425ab2c..c2a72516b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,8 @@ checks:pylint:
   stage: checks
 
 checks:tests:
+  variables:
+    VM_IMAGE: "fedora:41"
   after_script:
   - ci/codecov-wrapper -F unittests
   before_script:
@@ -21,7 +23,7 @@ checks:tests:
       # Installing ZFS after the CI requirements so after_script codecov-wrapper does not explode if ZFS install fails.
       kver=$(uname -r)
       echo $kver is the running kernel >&2
-      sudo dnf install -y https://zfsonlinux.org/fedora/zfs-release-3-1$(rpm --eval "%{dist}").noarch.rpm
+      sudo dnf install -y https://zfsonlinux.org/fedora/zfs-release-3-1.fc42.noarch.rpm
       # We are now going to force the installation of the specific kernel-devel version
       # that matches the current kernel.  If unavailable, the test should fail now.
       # Ideally the VM image ships with a kernel-devel package that matches the
diff --git a/qubes/tests/integ/vm_qrexec_gui.py b/qubes/tests/integ/vm_qrexec_gui.py
index 245fd1a9d..688b3caa4 100644
--- a/qubes/tests/integ/vm_qrexec_gui.py
+++ b/qubes/tests/integ/vm_qrexec_gui.py
@@ -83,11 +83,11 @@ def test_010_run_xterm(self):
         self.assertEqual(self.testvm1.get_power_state(), "Running")
 
         self.loop.run_until_complete(self.wait_for_session(self.testvm1))
-        p = self.loop.run_until_complete(self.testvm1.run("xterm"))
+        title = "user@{}".format(self.testvm1.name)
+        p = self.loop.run_until_complete(
+            self.testvm1.run(f"xterm -title {title}")
+        )
         try:
-            title = "user@{}".format(self.testvm1.name)
-            if self.template.count("whonix"):
-                title = "user@host"
             self.wait_for_window(title)
 
             self.loop.run_until_complete(asyncio.sleep(0.5))
@@ -123,6 +123,8 @@ def test_011_run_gnome_terminal(self):
             self.skipTest("Xfce template doesn't have 'gnome-terminal'")
         if "archlinux" in self.template:
             self.skipTest("Arch template doesn't have 'gnome-terminal'")
+        if "guix" in self.template:
+            self.skipTest("Guix template doesn't have 'gnome-terminal'")
         self.loop.run_until_complete(self.testvm1.start())
         self.assertEqual(self.testvm1.get_power_state(), "Running")
         self.loop.run_until_complete(self.wait_for_session(self.testvm1))
@@ -373,9 +375,11 @@ def test_115_qrexec_filecopy_no_agent(self):
 
         with self.qrexec_policy("qubes.Filecopy", self.testvm1, self.testvm2):
             try:
+                service_ctl = "herd" if "guix" in self.template else "systemctl"
                 self.loop.run_until_complete(
                     self.testvm2.run_for_stdio(
-                        "systemctl stop qubes-qrexec-agent.service", user="root"
+                        f"{service_ctl} stop qubes-qrexec-agent.service",
+                        user="root",
                     )
                 )
             except subprocess.CalledProcessError: