diff --git a/lib/anacondatest.pm b/lib/anacondatest.pm
index 24f7245d..7f3c94eb 100644
--- a/lib/anacondatest.pm
+++ b/lib/anacondatest.pm
@@ -90,10 +90,6 @@ sub select_disks {
         }
         # For exactly 1 disk, we don't need to do anything.
     }
-
-    if (get_var('DISK_CUSTOM')) {
-        assert_and_click "anaconda_manual_partitioning";
-    }
 }
 
 sub custom_scheme_select {
diff --git a/tests/disk_custom_software_raid.pm b/tests/disk_custom_software_raid.pm
index 70cbcd5c..bc5b4401 100644
--- a/tests/disk_custom_software_raid.pm
+++ b/tests/disk_custom_software_raid.pm
@@ -5,8 +5,9 @@ use testapi;
 sub run {
     my $self = shift;
     # Go to INSTALLATION DESTINATION and ensure two disks are selected.
-    # Because DISK_CUSTOM is set, select_disks will select custom for us.
     $self->select_disks(2);
+    # select custom partitioning
+    assert_and_click "anaconda_manual_partitioning";
     assert_and_click "anaconda_spoke_done";
 
     # Manual partitioning spoke should be displayed