diff --git a/main.pm b/main.pm
index d86d6795af9ae252c9f0696c6964be575a6d6dc9..fbc26099260ec8605554bcff0f8820b79883093e 100644
--- a/main.pm
+++ b/main.pm
@@ -27,7 +27,6 @@ if ($testsuite eq "gnome_install") {
     autotest::loadtest("tests/gnome_disable_update_notification.pm");
     autotest::loadtest("tests/gnome_desktop.pm");
     autotest::loadtest("tests/app_baobab.pm");
-    autotest::loadtest("tests/app_eog.pm");
     autotest::loadtest("tests/app_epiphany.pm");
     autotest::loadtest("tests/app_evince.pm");
     autotest::loadtest("tests/app_gnome_calculator.pm");
@@ -43,10 +42,10 @@ if ($testsuite eq "gnome_install") {
     autotest::loadtest("tests/app_gnome_logs.pm");
     autotest::loadtest("tests/app_gnome_maps.pm");
     autotest::loadtest("tests/app_gnome_music.pm");
-    autotest::loadtest("tests/app_gnome_photos.pm");
     autotest::loadtest("tests/app_gnome_software.pm");
     autotest::loadtest("tests/app_gnome_system_monitor.pm");
     autotest::loadtest("tests/app_gnome_text_editor.pm");
+    autotest::loadtest("tests/app_loupe.pm");
     autotest::loadtest("tests/app_nautilus.pm");
     autotest::loadtest("tests/app_snapshot.pm");
     autotest::loadtest("tests/app_settings.pm");
diff --git a/tests/app_eog.pm b/tests/app_eog.pm
deleted file mode 100644
index ed83b8d9c29060944b6739ef088af8403a224e92..0000000000000000000000000000000000000000
--- a/tests/app_eog.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-use base 'app_test';
-use strict;
-use warnings;
-use testapi;
-use gnomeutils;
-
-sub run {
-    start_app('eog');
-    assert_screen('app_eog_home', 10);
-    close_app;
-}
-
-1;
diff --git a/tests/app_gnome_photos.pm b/tests/app_gnome_photos.pm
deleted file mode 100644
index d2ecae8f7a7b88bb863ef7c913ec04d284e0a2e0..0000000000000000000000000000000000000000
--- a/tests/app_gnome_photos.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-use base 'app_test';
-use strict;
-use warnings;
-use testapi;
-use gnomeutils;
-
-sub run {
-    start_app('gnome-photos');
-    assert_screen('app_gnome_photos_home', 10);
-    close_app;
-}
-
-1;
diff --git a/tests/app_loupe.pm b/tests/app_loupe.pm
new file mode 100644
index 0000000000000000000000000000000000000000..3a664fce38e1fd287265fdd4c6ea4257c71b1973
--- /dev/null
+++ b/tests/app_loupe.pm
@@ -0,0 +1,14 @@
+use base 'app_test';
+use strict;
+use warnings;
+use testapi;
+use gnomeutils;
+
+sub run {
+    # Pass an image to Loupe to test image loaders a bit.
+    start_app('loupe /usr/share/pixmaps/gnome-boot-logo.png');
+    assert_screen('app_loupe_home', 10);
+    close_app;
+}
+
+1;