diff --git a/lib/testmap.py b/lib/testmap.py
index 286acdf4dd..28e2f3fe19 100644
--- a/lib/testmap.py
+++ b/lib/testmap.py
@@ -55,6 +55,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             # no udisks on CoreOS → skip storage
             *contexts('fedora-coreos', COCKPIT_SCENARIOS - {'storage'}),
             *contexts('rhel-9-5', COCKPIT_SCENARIOS),
+            *contexts('rhel-9-6', COCKPIT_SCENARIOS),
             *contexts('rhel-10-0', COCKPIT_SCENARIOS),
             *contexts('centos-10', COCKPIT_SCENARIOS),
         ],
@@ -67,7 +68,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
         '_manual': [
             'fedora-rawhide',
             'opensuse-tumbleweed',
-            'rhel-9-6',
         ],
     },
     'cockpit-project/starter-kit': {
@@ -83,7 +83,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
         ],
         '_manual': [
             'centos-9-bootc',
-            'rhel-9-5',
             'rhel-9-6',
         ]
     },
@@ -109,6 +108,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'fedora-coreos',
             'rhel-8-10',
             'rhel-9-5',
+            'rhel-9-6',
             'rhel-10-0',
             'ubuntu-2204',
             'ubuntu-2404',
@@ -118,7 +118,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'centos-10',
             'fedora-rawhide',
             'opensuse-tumbleweed',
-            'rhel-9-6',
         ],
     },
     'cockpit-project/cockpit-machines': {
@@ -136,6 +135,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'opensuse-tumbleweed',
             'rhel-8-10',
             'rhel-9-5',
+            'rhel-9-6',
         ],
         'rhel-8': [
             'rhel-8-10',
@@ -144,7 +144,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'centos-10',
             'fedora-rawhide',
             'rhel-10-0',
-            'rhel-9-6',
         ],
     },
     'cockpit-project/cockpit-files': {
@@ -182,6 +181,7 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
         'main': [
             'centos-10',
             'rhel-9-5',
+            'rhel-9-6',
             'rhel-10-0',
             'fedora-39',
             'fedora-40',
@@ -206,7 +206,6 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'rhel-9-4',
         ],
         '_manual': [
-            'rhel-9-6',
         ],
     },
     'candlepin/subscription-manager-cockpit': {
@@ -214,13 +213,13 @@ def contexts(image: str, *scenarios: Iterable[str], repo: str | None = None) ->
             'centos-9-stream/subscription-manager-1.29',
             'centos-10',
             'rhel-9-5/subscription-manager-1.29',
+            'rhel-9-6/subscription-manager-1.29',
             'rhel-10-0',
             'fedora-39',
             'fedora-40',
             'fedora-41',
         ],
         '_manual': [
-            'rhel-9-6',
         ],
     },
     'rhinstaller/anaconda-webui': {