diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm
index a80d3858..3833453f 100644
--- a/tests/disk_custom_standard_partition_ext4_postinstall.pm
+++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm
@@ -11,13 +11,13 @@ sub run {
     assert_screen "root_console";
     my $count = 4;
     my $devroot = 'vda1';
-    my $devboot = 'vda2';
-    my $devswap = 'vda3';
+    my $devswap = 'vda2';
+    my $devboot = 'vda3';
     if (get_var('OFW') || get_var('UEFI')) {
         $count = 5; # extra boot partition (PreP or ESP)
         $devroot = 'vda2';
-        $devboot = 'vda3';
-        $devswap = 'vda4';
+        $devswap = 'vda3';
+        $devboot = 'vda4';
     }
     # check number of partitions
     script_run 'fdisk -l | grep /dev/vda'; # debug