diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm
index 4b388531..429eabdb 100644
--- a/tests/disk_custom_standard_partition_ext4_postinstall.pm
+++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm
@@ -4,13 +4,15 @@ use testapi;
 
 sub run {
     assert_screen "root_console";
-    my $count = 3;
+    my $count = 4;
     my $devroot = 'vda1';
     my $devboot = 'vda2';
+    my $devswap = 'vda3';
     if (get_var('OFW') || get_var('UEFI')) {
-        $count = 4; # extra boot partition (PreP or ESP)
+        $count = 5; # extra boot partition (PreP or ESP)
         $devroot = 'vda2';
         $devboot = 'vda3';
+        $devswap = 'vda4';
     }
     # check number of partitions
     script_run 'fdisk -l | grep /dev/vda'; # debug
@@ -19,6 +21,7 @@ sub run {
     script_run 'mount | grep /dev/vda'; # debug
     validate_script_output "mount | grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ };
     validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ };
+    validate_script_output "swapon --show | grep /dev/$devswap", sub { $_ =~ m/ partition / };
 }
 
 sub test_flags {