diff --git a/needles/anaconda_kde_highlighted.json b/needles/anaconda_kde_highlighted.json
new file mode 100644
index 00000000..60f31398
--- /dev/null
+++ b/needles/anaconda_kde_highlighted.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "anaconda_kde_highlighted"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 53,
+      "ypos": 278,
+      "width": 26,
+      "height": 12,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_kde_highlighted.png b/needles/anaconda_kde_highlighted.png
new file mode 100644
index 00000000..814139f4
Binary files /dev/null and b/needles/anaconda_kde_highlighted.png differ
diff --git a/needles/anaconda_kde_selected.json b/needles/anaconda_kde_selected.json
new file mode 100644
index 00000000..685220b2
--- /dev/null
+++ b/needles/anaconda_kde_selected.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "anaconda_kde_selected"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 31,
+      "ypos": 278,
+      "width": 49,
+      "height": 12,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_kde_selected.png b/needles/anaconda_kde_selected.png
new file mode 100644
index 00000000..13bea71a
Binary files /dev/null and b/needles/anaconda_kde_selected.png differ
diff --git a/templates b/templates
index 7d10aaf0..2783062d 100755
--- a/templates
+++ b/templates
@@ -296,6 +296,16 @@
                                     },
                       test_suite => { name => "server_no_swap" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "package_set_kde" },
+                    },
                     {
                       machine    => { name => "uefi" },
                       product    => {
@@ -636,6 +646,16 @@
                                     },
                       test_suite => { name => "upgrade_2_desktop_32bit" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      product    => {
+                                      arch    => "i386",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "package_set_kde" },
+                    },
                   ],
   Machines     => [
                     {
@@ -1008,6 +1028,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f23_desktop_x86_64.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },
@@ -1042,6 +1063,7 @@
                         { key => "BOOTFROM", value => "c" },
                         { key => "HDD_1", value => "disk_f23_desktop_i686.img" },
                         { key => "UPGRADE", value => "desktop" },
+                        { key => "DESKTOP", value => "gnome" },
                       ],
                       variables => "",
                     },
@@ -1108,5 +1130,14 @@
                       ],
                       variables => "",
                     },
+                    {
+                      name => "package_set_kde",
+                      prio => 26,
+                      settings => [
+                        { key => "DESKTOP", value => "kde" },
+                        { key => "PACKAGE_SET", value => "kde" },
+                      ],
+                      variables => "",
+                    },
                   ],
 }