diff --git a/templates.fif.json b/templates.fif.json
index d61c3f3c..e5847373 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -2382,6 +2382,17 @@
                 "WORKER_CLASS": "tap"
             }
         },
+        "gwenview": {
+            "profiles": {
+                "fedora-KDE-live-iso-x86_64-*-64bit": 42
+            },
+            "settings": {
+                "BOOTFROM": "c",
+                "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "POSTINSTALL_PATH": "tests/applications/gwenview",
+                "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
+            }
+        },
         "kcalc": {
             "profiles": {
                 "fedora-KDE-live-iso-x86_64-*-64bit": 42
diff --git a/tests/applications/gwenview/aaa_setup.pm b/tests/applications/gwenview/aaa_setup.pm
index 96527d5c..16bd7312 100644
--- a/tests/applications/gwenview/aaa_setup.pm
+++ b/tests/applications/gwenview/aaa_setup.pm
@@ -3,8 +3,8 @@ use strict;
 use testapi;
 use utils;
 
-# This script will download the test data for EoG, start the application,
-# and set a milestone as a starting point for the other Loupe tests.
+# This script will download the test data for Gwenview, start the application,
+# and set a milestone as a starting point for the other Gwenview tests.
 
 sub run {
     my $self = shift;
@@ -17,30 +17,28 @@ sub run {
     # Exit the terminal
     desktop_vt;
 
-    # Set the update notification timestamp
-    set_update_notification_timestamp();
     # Start the application
-    menu_launch_type("image viewer");
+    menu_launch_type("gwenview");
     # Check that is started
-    assert_screen 'apps_run_imageviewer';
+    assert_screen 'imageviewer_runs';
 
-    # Fullsize the Loupe window.
-    send_key("super-up");
+    # Fullsize the application window.
+    send_key("super-pgup");
 
-    # Open the test file to create a starting point for the other EoG tests.
+    # Open the test file to create a starting point for the other tests.
     send_key("ctrl-o");
 
     # Open the Pictures folder.
-    assert_and_click("gnome_dirs_pictures", button => "left", timeout => 30);
+    assert_and_click("gwen_pictures_directory", button => "left", timeout => 30);
 
     # Select the image.jpg file.
-    assert_and_click("loupe_file_select_jpg", button => "left", timeout => 30);
+    assert_and_click("gwen_file_select_jpg", button => "left", timeout => 30);
 
     # Hit enter to open it.
     send_key("ret");
 
     # Check that the file has been successfully opened.
-    assert_screen("loupe_image_default");
+    assert_screen("gwen_image_default");
 }
 
 sub test_flags {