diff --git a/needles/background/29_background.json b/needles/background/29_background.json
new file mode 100644
index 00000000..da76f8a9
--- /dev/null
+++ b/needles/background/29_background.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 884,
+      "ypos": 355,
+      "width": 120,
+      "height": 47,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "29_background"
+  ]
+}
diff --git a/needles/background/29_background.png b/needles/background/29_background.png
new file mode 100644
index 00000000..0f7868e4
Binary files /dev/null and b/needles/background/29_background.png differ
diff --git a/needles/anaconda/identification/30_wallpaper.json b/needles/background/30_background.json
similarity index 89%
rename from needles/anaconda/identification/30_wallpaper.json
rename to needles/background/30_background.json
index bad14b46..1a64aee6 100644
--- a/needles/anaconda/identification/30_wallpaper.json
+++ b/needles/background/30_background.json
@@ -10,6 +10,6 @@
     ],
     "properties": [],
     "tags": [
-        "30_wallpaper"
+        "30_background"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/identification/30_wallpaper.png b/needles/background/30_background.png
similarity index 100%
rename from needles/anaconda/identification/30_wallpaper.png
rename to needles/background/30_background.png
diff --git a/templates b/templates
index 85939d37..ecfdb0be 100755
--- a/templates
+++ b/templates
@@ -579,6 +579,39 @@
                                     },
                       test_suite => { name => "desktop_browser" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 20,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "Workstation-live-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 22,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "KDE-live-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 50,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "Silverblue-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 30,
@@ -2936,6 +2969,18 @@
                                     },
                       test_suite => { name => "desktop_browser" },
                     },
+                    {
+                      group_name => "Fedora PowerPC",
+                      machine    => { name => "ppc64le" },
+                      prio       => 50,
+                      product    => {
+                                      arch    => "ppc64le",
+                                      distri  => "fedora",
+                                      flavor  => "Silverblue-dvd_ostree-iso",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
                     {
                       group_name => "Fedora AArch64",
                       machine    => { name => "aarch64" },
@@ -4165,7 +4210,6 @@
                       settings => [
                         { key => "PACKAGE_SET", value => "default" },
                         { key => "POSTINSTALL", value => "_collect_data" },
-                        { key => "IDENTIFICATION", value => "true" },
                       ],
                     },
                     {
@@ -5110,6 +5154,15 @@
                         { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
                       ],
                     },
+                    {
+                      name => "desktop_background",
+                      settings => [
+                        { key => "POSTINSTALL", value => "desktop_background" },
+                        { key => "START_AFTER_TEST", value => "install_default_upload" },
+                        { key => "BOOTFROM", value => "c" },
+                        { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
+                      ],
+                    },
                     {
                       name => "apps_startstop",
                       settings => [
diff --git a/templates-updates b/templates-updates
index 22e8f990..de06e087 100755
--- a/templates-updates
+++ b/templates-updates
@@ -222,6 +222,30 @@
                                     },
                       test_suite => { name => "desktop_browser" },
                     },
+                    {
+                      group_name => "Fedora Updates",
+                      machine    => { name => "64bit" },
+                      prio       => 30,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "updates-workstation",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
+                    {
+                      group_name => "Fedora Updates",
+                      machine    => { name => "64bit" },
+                      prio       => 32,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "updates-kde",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "desktop_background" },
+                    },
                     {
                       group_name => "Fedora Updates",
                       machine    => { name => "64bit" },
diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index 84344dc0..1eb23b27 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -84,12 +84,6 @@ sub run {
     mouse_set(300, 800);
     # KDE can take ages to start up
     check_desktop_clean(tries=>40);
-    # If we want to check that there is a correct wallpaper used, as a part
-    # of self identification test, we will do it here.
-    if (get_var('IDENTIFICATION') eq 'true') {
-        my $version = get_var('VERSION');
-        assert_screen "${version}_wallpaper";
-    }
 }
 
 sub test_flags {
diff --git a/tests/desktop_background.pm b/tests/desktop_background.pm
new file mode 100644
index 00000000..cda30624
--- /dev/null
+++ b/tests/desktop_background.pm
@@ -0,0 +1,17 @@
+use base "installedtest";
+use strict;
+use testapi;
+
+sub run {
+    check_desktop_clean;
+    # If we want to check that there is a correct background used, as a part
+    # of self identification test, we will do it here. For now we don't do
+    # this for Rawhide as Rawhide doesn't have its own backgrounds and we
+    # don't have any requirement for what background Rawhide uses.
+    my $version = get_var('VERSION');
+    assert_screen "${version}_background" if ($version ne "Rawhide");
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}