diff --git a/needles/gnome/apps/apps_menu_camera-20231015.json b/needles/gnome/apps/apps_menu_camera-20231015.json
new file mode 100644
index 00000000..391b2fb5
--- /dev/null
+++ b/needles/gnome/apps/apps_menu_camera-20231015.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 23,
+      "width": 19,
+      "ypos": 263,
+      "type": "match",
+      "xpos": 185
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "apps_menu_camera"
+  ]
+}
diff --git a/needles/gnome/apps/apps_menu_camera-20231015.png b/needles/gnome/apps/apps_menu_camera-20231015.png
new file mode 100644
index 00000000..372e3fe1
Binary files /dev/null and b/needles/gnome/apps/apps_menu_camera-20231015.png differ
diff --git a/needles/gnome/apps/apps_menu_cheese-20210222.json b/needles/gnome/apps/apps_menu_cheese-20210222.json
index 1002fbf0..5a735f41 100644
--- a/needles/gnome/apps/apps_menu_cheese-20210222.json
+++ b/needles/gnome/apps/apps_menu_cheese-20210222.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "apps_menu_cheese"
+    "apps_menu_camera"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/gnome/apps/apps_run_camera-20231015.json b/needles/gnome/apps/apps_run_camera-20231015.json
new file mode 100644
index 00000000..d8313487
--- /dev/null
+++ b/needles/gnome/apps/apps_run_camera-20231015.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 133,
+      "height": 128,
+      "ypos": 291,
+      "type": "match",
+      "xpos": 444
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "apps_run_camera"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/apps_run_camera-20231015.png b/needles/gnome/apps/apps_run_camera-20231015.png
new file mode 100644
index 00000000..7d894f62
Binary files /dev/null and b/needles/gnome/apps/apps_run_camera-20231015.png differ
diff --git a/needles/gnome/apps/apps_run_cheese-20200117.json b/needles/gnome/apps/apps_run_cheese-20200117.json
index 195de09e..88ad40a9 100644
--- a/needles/gnome/apps/apps_run_cheese-20200117.json
+++ b/needles/gnome/apps/apps_run_cheese-20200117.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "apps_run_cheese"
+    "apps_run_camera"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/vnc/boxes_allow_inhibit-20220517.json b/needles/gnome/gnome_allow-20220517.json
similarity index 63%
rename from needles/anaconda/vnc/boxes_allow_inhibit-20220517.json
rename to needles/gnome/gnome_allow-20220517.json
index fdb04183..894bfc70 100644
--- a/needles/anaconda/vnc/boxes_allow_inhibit-20220517.json
+++ b/needles/gnome/gnome_allow-20220517.json
@@ -11,8 +11,6 @@
   ],
   "properties": [],
   "tags": [
-    "boxes_allow_inhibit",
-    "connections_allow_inhibit",
-    "vinagre_allow_inhibit"
+    "gnome_allow"
   ]
 }
diff --git a/needles/anaconda/vnc/boxes_allow_inhibit-20220517.png b/needles/gnome/gnome_allow-20220517.png
similarity index 100%
rename from needles/anaconda/vnc/boxes_allow_inhibit-20220517.png
rename to needles/gnome/gnome_allow-20220517.png
diff --git a/tests/_vnc_client_connect.pm b/tests/_vnc_client_connect.pm
index f41d0d63..cac47efc 100644
--- a/tests/_vnc_client_connect.pm
+++ b/tests/_vnc_client_connect.pm
@@ -15,7 +15,7 @@ sub run {
         assert_and_click('vinagre_enable_shortcuts');
         sleep 2;
     }
-    assert_and_click('vinagre_allow_inhibit');
+    assert_and_click('gnome_allow');
     assert_and_click('vinagre_fullscreen');
 }
 
diff --git a/tests/apps_startstop/gnome/camera.pm b/tests/apps_startstop/gnome/camera.pm
new file mode 100644
index 00000000..161c9036
--- /dev/null
+++ b/tests/apps_startstop/gnome/camera.pm
@@ -0,0 +1,33 @@
+use base "installedtest";
+use strict;
+use testapi;
+use utils;
+
+# This test checks that Camera (snapshot) starts.
+
+sub run {
+    my $self = shift;
+    # FIXME after F39 is stable, drop the old 'cheese' needles
+    # and always expect the access dialog
+
+    # Start the application
+    start_with_launcher('apps_menu_camera');
+    # Check that is started or we see the camera access dialog
+    assert_screen ['apps_run_camera', 'gnome_allow'];
+    if (match_has_tag 'gnome_allow') {
+        click_lastmatch;
+        assert_screen 'apps_run_camera';
+    }
+    # Register application
+    register_application("gnome-snapshot");
+    # Close the application
+    quit_with_shortcut();
+}
+
+sub test_flags {
+    return {always_rollback => 1};
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/apps_startstop/gnome/cheese.pm b/tests/apps_startstop/gnome/cheese.pm
deleted file mode 100644
index 252d125b..00000000
--- a/tests/apps_startstop/gnome/cheese.pm
+++ /dev/null
@@ -1,27 +0,0 @@
-use base "installedtest";
-use strict;
-use testapi;
-use utils;
-
-# This test checks that Cheese starts.
-
-sub run {
-    my $self = shift;
-
-    # Start the application
-    start_with_launcher('apps_menu_cheese');
-    # Check that is started
-    assert_screen 'apps_run_cheese';
-    # Register application
-    register_application("gnome-cheese");
-    # Close the application
-    quit_with_shortcut();
-}
-
-sub test_flags {
-    return {always_rollback => 1};
-}
-
-1;
-
-# vim: set sw=4 et: