diff --git a/needles/anaconda_parth_fs_xfs.json b/needles/anaconda_parth_fs_xfs.json
new file mode 100644
index 00000000..5f7ab4a2
--- /dev/null
+++ b/needles/anaconda_parth_fs_xfs.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server",
+    "anaconda_part_fs_xfs"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 380,
+      "ypos": 448,
+      "width": 21,
+      "height": 16,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_parth_fs_xfs.png b/needles/anaconda_parth_fs_xfs.png
new file mode 100644
index 00000000..c051e093
Binary files /dev/null and b/needles/anaconda_parth_fs_xfs.png differ
diff --git a/templates b/templates
index 7a455071..97b8e170 100755
--- a/templates
+++ b/templates
@@ -266,6 +266,16 @@
                                     },
                       test_suite => { name => "server_ext3" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "server_xfs" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       product    => {
@@ -356,6 +366,16 @@
                                     },
                       test_suite => { name => "server_ext3" },
                     },
+                    {
+                      machine    => { name => "uefi" },
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "server_xfs" },
+                    },
                     {
                       machine    => { name => "uefi" },
                       product    => {
@@ -1025,5 +1045,14 @@
                       ],
                       variables => "",
                     },
+                    {
+                      name => "server_xfs",
+                      prio => 25,
+                      settings => [
+                        { key => "PARTITIONING", value => "custom_xfs" },
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                      ],
+                      variables => "",
+                    },
                   ],
 }
diff --git a/tests/disk_custom_xfs.pm b/tests/disk_custom_xfs.pm
new file mode 100644
index 00000000..72f05759
--- /dev/null
+++ b/tests/disk_custom_xfs.pm
@@ -0,0 +1,37 @@
+use base "anacondatest";
+use strict;
+use testapi;
+
+sub run {
+    my $self = shift;
+    # Go to INSTALLATION DESTINATION and ensure the disk is selected.
+    # Because PARTITIONING starts with 'custom_', this will select custom.
+    $self->select_disks();
+    assert_and_click "anaconda_spoke_done";
+
+    # Manual partitioning spoke should be displayed. Select Standard
+    # Partition scheme
+    $self->custom_scheme_select("standard");
+    # Do 'automatic' partition creation
+    assert_and_click "anaconda_part_automatic";
+    # Change root partition to xfs
+    $self->custom_change_fs("xfs");
+    assert_and_click "anaconda_spoke_done";
+    assert_and_click "anaconda_part_accept_changes";
+
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
+}
+
+sub test_flags {
+    # without anything - rollback to 'lastgood' snapshot if failed
+    # 'fatal' - whole test suite is in danger if this fails
+    # 'milestone' - after this test succeeds, update 'lastgood'
+    # 'important' - if this fails, set the overall state to 'fail'
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: