diff --git a/main.pm b/main.pm
index d6cfd7f4..63b872da 100644
--- a/main.pm
+++ b/main.pm
@@ -25,6 +25,9 @@ autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm";
 if (get_var('DISK_GUIDED_EMPTY')){
     autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_empty.pm";
 }
+elsif (get_var('DISK_GUIDED_MULTI')){
+    autotest::loadtest get_var('CASEDIR')."/tests/disk_guided_multi.pm";
+}
 
 # Start installation, set user & root passwords, reboot
 autotest::loadtest get_var('CASEDIR')."/tests/_do_install_and_reboot.pm";
diff --git a/needles/anaconda_install_destination_select_disk_1.json b/needles/anaconda_install_destination_select_disk_1.json
new file mode 100644
index 00000000..b24285de
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_1.json
@@ -0,0 +1,24 @@
+{
+  "tags": [
+    "anaconda_install_destination_select_disk_1",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 67,
+      "ypos": 175,
+      "width": 69,
+      "height": 71,
+      "type": "match"
+    },
+    {
+      "xpos": 27,
+      "ypos": 276,
+      "width": 148,
+      "height": 24,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_1.png b/needles/anaconda_install_destination_select_disk_1.png
new file mode 100644
index 00000000..5e180f6b
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_1.png differ
diff --git a/needles/anaconda_install_destination_select_disk_2.json b/needles/anaconda_install_destination_select_disk_2.json
new file mode 100644
index 00000000..b142ca6b
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_2.json
@@ -0,0 +1,24 @@
+{
+  "tags": [
+    "anaconda_install_destination_select_disk_2",
+    "ENV-DISTRI-fedora",
+    "ENV-INSTLANG-en_US",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 228,
+      "ypos": 175,
+      "width": 110,
+      "height": 76,
+      "type": "match"
+    },
+    {
+      "xpos": 211,
+      "ypos": 277,
+      "width": 145,
+      "height": 26,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_2.png b/needles/anaconda_install_destination_select_disk_2.png
new file mode 100644
index 00000000..64115b8a
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_2.png differ
diff --git a/templates b/templates
index a23b1a52..6027c2c8 100755
--- a/templates
+++ b/templates
@@ -46,5 +46,14 @@
                       ],
                       variables => "",
                     },
+                    {
+                      name => "server_sata_multi",
+                      prio => 2,
+                      settings => [
+                        { key => "NUMDISKS", value => "2" },
+                        { key => "DISK_GUIDED_MULTI", value => "1" },
+                      ],
+                      variables => "",
+                    },
                   ],
 }
diff --git a/tests/disk_guided_multi.pm b/tests/disk_guided_multi.pm
new file mode 100644
index 00000000..52aec51e
--- /dev/null
+++ b/tests/disk_guided_multi.pm
@@ -0,0 +1,30 @@
+use base "basetest";
+use strict;
+use testapi;
+
+sub run {
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
+    # Select both disks
+    assert_and_click "anaconda_main_hub_install_destination";
+    assert_and_click "anaconda_install_destination_select_disk_1";
+    assert_and_click "anaconda_install_destination_select_disk_2";
+    assert_and_click "anaconda_spoke_done";
+
+    # 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 { important => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: