diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index cf91e23a..bcf4876c 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -33,17 +33,10 @@ sub select_disks {
     assert_and_click "anaconda_main_hub_install_destination";
 
     if (get_var('NUMDISKS') > 1) {
-        if (get_var('OFW') && ($args{disks} == 1)) {
-            # we want to select only one disk
-            # for PowerPC this must be the second one that is empty.
-            assert_and_click "anaconda_install_destination_select_disk_2";
-        }
-        else {
-            # Multi-disk case. Select however many disks the test needs. If
-            # $disks is 0, this will do nothing, and 0 disks will be selected.
-            for my $n (1 .. $args{disks}) {
-                assert_and_click "anaconda_install_destination_select_disk_$n";
-            }
+        # Multi-disk case. Select however many disks the test needs. If
+        # $disks is 0, this will do nothing, and 0 disks will be selected.
+        for my $n (1 .. $args{disks}) {
+            assert_and_click "anaconda_install_destination_select_disk_$n";
         }
     }
     else {
diff --git a/tests/disk_guided_multi_postinstall.pm b/tests/disk_guided_multi_postinstall.pm
index 9dfc9123..60fb71ab 100644
--- a/tests/disk_guided_multi_postinstall.pm
+++ b/tests/disk_guided_multi_postinstall.pm
@@ -5,13 +5,7 @@ use testapi;
 sub run {
     assert_screen "root_console";
     # check that second disk is intact
-    if (get_var('OFW')) {
-        # on PowerPC, installation disk is second disk (vdb)
-        # so need to check vda
-        assert_script_run 'mount /dev/vda1 /mnt';
-    } else {
-        assert_script_run 'mount /dev/vdb1 /mnt';
-    }
+    assert_script_run 'mount /dev/vdb1 /mnt';
     validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
 }