diff --git a/tests/_live_build.pm b/tests/_live_build.pm
index fb5d5490..5ed23ed5 100644
--- a/tests/_live_build.pm
+++ b/tests/_live_build.pm
@@ -49,6 +49,10 @@ sub run {
         # https://github.com/rpm-software-management/mock/issues/1177
         assert_script_run "echo \"config_opts['releasever'] = '${version}'\" >> /etc/mock/openqa.cfg";
     }
+    elsif ($version eq "39") {
+        # similar corrections for F39, while mock still thinks it's Rawhide
+        assert_script_run "sed -e 's,38,39,g' /etc/mock/fedora-38-${arch}.cfg > /etc/mock/fedora-39-${arch}.cfg";
+    }
     # make the side and workarounds repos and the serial device available inside the mock root
     assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_enable\'] = True" >> /etc/mock/openqa.cfg';
     assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/mnt/updateiso/update_repo\', \'/mnt/updateiso/update_repo\'))" >> /etc/mock/openqa.cfg' if (get_var("ISO_2"));
diff --git a/tests/applications/eog/aaa_setup.pm b/tests/applications/eog/aaa_setup.pm
index 9217c9a2..6f397c26 100644
--- a/tests/applications/eog/aaa_setup.pm
+++ b/tests/applications/eog/aaa_setup.pm
@@ -18,7 +18,9 @@ sub run {
     desktop_vt;
 
     # Start the application
-    menu_launch_type("eye of gnome");
+    my $launch = "eye of gnome";
+    $launch = "image viewer" if (get_var("CANNED"));
+    menu_launch_type($launch);
     # Check that is started
     assert_screen 'apps_run_imageviewer';
 
diff --git a/tests/applications/maps/export.pm b/tests/applications/maps/export.pm
index 0c74c501..1a34e785 100644
--- a/tests/applications/maps/export.pm
+++ b/tests/applications/maps/export.pm
@@ -25,7 +25,9 @@ sub run {
     # it in an image viewer to see that it is correct.
     #
     # Open the Image Viewer
-    menu_launch_type("eye of gnome");
+    my $launch = "eye of gnome";
+    $launch = "image viewer" if (get_var("CANNED"));
+    menu_launch_type($launch);
     assert_screen("apps_run_imageviewer");
     send_key("super-up");
     # Read the file into the application.