diff --git a/tests/disk_custom_blivet_btrfs.pm b/tests/disk_custom_blivet_btrfs.pm
index 863c1215..21edb595 100644
--- a/tests/disk_custom_blivet_btrfs.pm
+++ b/tests/disk_custom_blivet_btrfs.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,7 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    custom_blivet_add_partition(size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(size => 1024, mountpoint => '/boot');
 
     # selecting "btrfs" as filesystem creates new BTRFS drive in blivet-gui
     custom_blivet_add_partition(filesystem => 'btrfs');
diff --git a/tests/disk_custom_blivet_lvm_ext4.pm b/tests/disk_custom_blivet_lvm_ext4.pm
index fca2b381..e4b761d1 100644
--- a/tests/disk_custom_blivet_lvm_ext4.pm
+++ b/tests/disk_custom_blivet_lvm_ext4.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,7 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    custom_blivet_add_partition(size => 512, mountpoint => '/boot', filesystem => 'ext4');
+    custom_blivet_add_partition(size => 1024, mountpoint => '/boot', filesystem => 'ext4');
     # add new LVM VG
     custom_blivet_add_partition(devicetype => 'lvmvg');
     # select newly created LVM device for adding new LV
diff --git a/tests/disk_custom_blivet_lvmthin.pm b/tests/disk_custom_blivet_lvmthin.pm
index c9e64ae2..7e3d95bf 100644
--- a/tests/disk_custom_blivet_lvmthin.pm
+++ b/tests/disk_custom_blivet_lvmthin.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,7 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    custom_blivet_add_partition(size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(size => 1024, mountpoint => '/boot');
     # add new LVM VG
     custom_blivet_add_partition(devicetype => 'lvmvg');
     # select newly created LVM device for adding new pool
diff --git a/tests/disk_custom_blivet_software_raid.pm b/tests/disk_custom_blivet_software_raid.pm
index 8a4c0dfd..f65ab3ea 100644
--- a/tests/disk_custom_blivet_software_raid.pm
+++ b/tests/disk_custom_blivet_software_raid.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(raid1 => 1, size => 1024, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(raid1 => 1, size => 2049, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -32,7 +32,7 @@ sub run {
         wait_still_screen 3;
         assert_and_click "anaconda_blivet_free_space";
     }
-    custom_blivet_add_partition(raid1 => 1, size => 1024, mountpoint => '/boot');
+    custom_blivet_add_partition(raid1 => 1, size => 1025, mountpoint => '/boot');
     custom_blivet_add_partition(raid1 => 1, mountpoint => '/');
 
     assert_and_click "anaconda_spoke_done";
diff --git a/tests/disk_custom_blivet_standard_partition_ext4.pm b/tests/disk_custom_blivet_standard_partition_ext4.pm
index 69c65982..e441d6a9 100644
--- a/tests/disk_custom_blivet_standard_partition_ext4.pm
+++ b/tests/disk_custom_blivet_standard_partition_ext4.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,8 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    #custom_blivet_add_partition(filesystem => 'ext4', mountpoint => '/');
-    custom_blivet_add_partition(filesystem => 'ext4', size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(filesystem => 'ext4', size => 1024, mountpoint => '/boot');
     custom_blivet_add_partition(filesystem => 'ext4', mountpoint => '/');
 
     assert_and_click "anaconda_spoke_done";
diff --git a/tests/disk_custom_blivet_with_swap.pm b/tests/disk_custom_blivet_with_swap.pm
index a725cd4c..91b16848 100644
--- a/tests/disk_custom_blivet_with_swap.pm
+++ b/tests/disk_custom_blivet_with_swap.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,7 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    custom_blivet_add_partition(size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(size => 1024, mountpoint => '/boot');
     custom_blivet_add_partition(size => 2048, filesystem => 'swap');
     custom_blivet_add_partition(mountpoint => '/');
 
diff --git a/tests/disk_custom_blivet_xfs.pm b/tests/disk_custom_blivet_xfs.pm
index 2b8eac39..db3f5780 100644
--- a/tests/disk_custom_blivet_xfs.pm
+++ b/tests/disk_custom_blivet_xfs.pm
@@ -12,7 +12,7 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, we need esp
-        custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+        custom_blivet_add_partition(size => 2048, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
     elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
@@ -22,7 +22,7 @@ sub run {
         # installs, so we need a biosboot partition
         custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
     }
-    custom_blivet_add_partition(size => 512, mountpoint => '/boot');
+    custom_blivet_add_partition(size => 1024, mountpoint => '/boot');
     custom_blivet_add_partition(filesystem => 'xfs', mountpoint => '/');
 
     assert_and_click "anaconda_spoke_done";