diff --git a/lib/testmap.py b/lib/testmap.py
index fe70ecd5ad..cdb390d0fc 100644
--- a/lib/testmap.py
+++ b/lib/testmap.py
@@ -128,6 +128,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'ubuntu-stable',
             'fedora-39',
             'fedora-40',
+            'fedora-41',
             f'{TEST_OS_DEFAULT}/devel',
             f'{TEST_OS_DEFAULT}/firefox',
             'opensuse-tumbleweed',
@@ -138,7 +139,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'rhel-8-10',
         ],
         '_manual': [
-            'fedora-41',
             'centos-10',
             'fedora-rawhide',
             'rhel-10-0',
diff --git a/naughty/fedora-41/6678-selinux-libvirt-ssh b/naughty/fedora-41/6678-selinux-libvirt-ssh
new file mode 100644
index 0000000000..1a3cb3daed
--- /dev/null
+++ b/naughty/fedora-41/6678-selinux-libvirt-ssh
@@ -0,0 +1,7 @@
+Traceback (most recent call last):
+  File "test/check-machines-migrate", line *, in test*
+    self._testMigrationGeneric(*
+  File "test/check-machines-migrate", line *, in _testMigrationGeneric
+    b.wait_not_present("#migrate-modal")
+*
+testlib.Error: timeout
diff --git a/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh b/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh
new file mode 100644
index 0000000000..6ba0a3d105
--- /dev/null
+++ b/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh
@@ -0,0 +1,5 @@
+*internal error: Could not run '/usr/bin/swtpm_setup'.*
+*
+Traceback (most recent call last):
+  File "check-machines-create", line *, in testConfigureBeforeInstall
+    testlib.wait(lambda: "VmNotInstalled" in m.execute("virsh list --persistent"), delay=3)
diff --git a/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh-2 b/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh-2
new file mode 100644
index 0000000000..06ad7e8bca
--- /dev/null
+++ b/naughty/fedora-41/6792-swtpm-and-selinux-again-sigh-2
@@ -0,0 +1,5 @@
+*internal error: Could not run '/usr/bin/swtpm_setup'.*
+*
+Traceback (most recent call last):
+  File "check-machines-create", line *, in testConfigureBeforeInstallBiosTPM
+    b.wait_in_text(f"#vm-{vmName}-system-state", "Running")