diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.json
new file mode 100644
index 00000000..d5a65632
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 419,
+      "ypos": 197,
+      "width": 32,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_blivet_part_fs_btrfs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.png
new file mode 100644
index 00000000..5e01113b
Binary files /dev/null and b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_btrfs-20170510.png differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_lvm_drive-20170420.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_volumes_icon-20170420.json
similarity index 76%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_lvm_drive-20170420.json
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_volumes_icon-20170420.json
index ab5bd941..65697910 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_lvm_drive-20170420.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_volumes_icon-20170420.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_lvm_drive"
+    "anaconda_blivet_volumes_icon"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_lvm_drive-20170420.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_volumes_icon-20170420.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_lvm_drive-20170420.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_volumes_icon-20170420.png
diff --git a/templates b/templates
index 55dfbb48..694a4923 100755
--- a/templates
+++ b/templates
@@ -899,7 +899,7 @@
                     },
                     {
                       machine    => { name => "64bit" },
-                      prio       => 90,
+                      prio       => 40,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -910,7 +910,18 @@
                     },
                     {
                       machine    => { name => "64bit" },
-                      prio       => 90,
+                      prio       => 40,
+                      product    => {
+                                      arch    => "x86_64",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_blivet_btrfs" },
+                    },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 50,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -921,7 +932,7 @@
                     },
                     {
                       machine    => { name => "64bit" },
-                      prio       => 90,
+                      prio       => 40,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -932,7 +943,7 @@
                     },
                     {
                       machine    => { name => "64bit" },
-                      prio       => 90,
+                      prio       => 40,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -943,7 +954,7 @@
                     },
                     {
                       machine    => { name => "64bit" },
-                      prio       => 90,
+                      prio       => 40,
                       product    => {
                                       arch    => "x86_64",
                                       distri  => "fedora",
@@ -1480,6 +1491,17 @@
                                     },
                       test_suite => { name => "install_blivet_ext3" },
                     },
+                    {
+                      machine    => { name => "64bit" },
+                      prio       => 93,
+                      product    => {
+                                      arch    => "i386",
+                                      distri  => "fedora",
+                                      flavor  => "universal",
+                                      version => "*",
+                                    },
+                      test_suite => { name => "install_blivet_btrfs" },
+                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 93,
@@ -1994,6 +2016,14 @@
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                       ],
                     },
+                    {
+                      name => "install_blivet_btrfs",
+                      settings => [
+                        { key => "PARTITIONING", value => "custom_blivet_btrfs" },
+                        { key => "POSTINSTALL", value => "disk_custom_btrfs_postinstall" },
+                        { key => "ROOT_PASSWORD", value => "weakpassword" },
+                      ],
+                    },
                     {
                       name => "install_blivet_no_swap",
                       settings => [
diff --git a/tests/disk_custom_blivet_btrfs.pm b/tests/disk_custom_blivet_btrfs.pm
new file mode 100644
index 00000000..0d1c8934
--- /dev/null
+++ b/tests/disk_custom_blivet_btrfs.pm
@@ -0,0 +1,37 @@
+use base "anacondatest";
+use strict;
+use testapi;
+use anaconda;
+
+sub run {
+    my $self = shift;
+    # Go to INSTALLATION DESTINATION and ensure the disk is selected.
+    # Because PARTITIONING starts with 'custom_blivet', this will select blivet-gui.
+    select_disks();
+    assert_and_click "anaconda_spoke_done";
+
+    custom_blivet_add_partition(size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(size => 2048, filesystem => 'swap');
+
+    # selecting "btrfs" as filesystem creates new BTRFS drive in blivet-gui
+    custom_blivet_add_partition(filesystem => 'btrfs');
+    # select newly created BTRFS drive (let's hope that BTRFS drive is only volume present)
+    assert_and_click "anaconda_blivet_volumes_icon";
+    # add root partition to btrfs drive
+    custom_blivet_add_partition(mountpoint => '/');
+
+    assert_and_click "anaconda_spoke_done";
+    assert_and_click "anaconda_part_accept_changes";
+
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/disk_custom_blivet_lvmthin.pm b/tests/disk_custom_blivet_lvmthin.pm
index 4b7801a2..345039ea 100644
--- a/tests/disk_custom_blivet_lvmthin.pm
+++ b/tests/disk_custom_blivet_lvmthin.pm
@@ -14,7 +14,7 @@ sub run {
     # add new LVM device
     custom_blivet_add_partition(devicetype => 'lvm');
     # select newly created LVM device for adding new partition
-    assert_and_click "anaconda_blivet_lvm_drive";
+    assert_and_click "anaconda_blivet_volumes_icon";
     custom_blivet_add_partition(size => 2048, filesystem => 'swap');
     # add lvmthinpool
     custom_blivet_add_partition(devicetype => 'lvmthin');