diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.json
new file mode 100644
index 00000000..f77d4b46
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 398,
+      "ypos": 139,
+      "width": 62,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_blivet_part_fs_biosboot"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.png
new file mode 100644
index 00000000..b208d478
Binary files /dev/null and b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_biosboot-20220816.png differ
diff --git a/tests/disk_custom_blivet_btrfs.pm b/tests/disk_custom_blivet_btrfs.pm
index 1db89df6..863c1215 100644
--- a/tests/disk_custom_blivet_btrfs.pm
+++ b/tests/disk_custom_blivet_btrfs.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # installs, so we need a biosboot partition
+        custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
+    }
     custom_blivet_add_partition(size => 512, mountpoint => '/boot');
 
     # selecting "btrfs" as filesystem creates new BTRFS drive in blivet-gui
diff --git a/tests/disk_custom_blivet_lvm_ext4.pm b/tests/disk_custom_blivet_lvm_ext4.pm
index ba73b706..fca2b381 100644
--- a/tests/disk_custom_blivet_lvm_ext4.pm
+++ b/tests/disk_custom_blivet_lvm_ext4.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # 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');
     # add new LVM VG
     custom_blivet_add_partition(devicetype => 'lvmvg');
diff --git a/tests/disk_custom_blivet_lvmthin.pm b/tests/disk_custom_blivet_lvmthin.pm
index abaaeb46..c9e64ae2 100644
--- a/tests/disk_custom_blivet_lvmthin.pm
+++ b/tests/disk_custom_blivet_lvmthin.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # installs, so we need a biosboot partition
+        custom_blivet_add_partition(size => 1, filesystem => 'biosboot');
+    }
     custom_blivet_add_partition(size => 512, mountpoint => '/boot');
     # add new LVM VG
     custom_blivet_add_partition(devicetype => 'lvmvg');
diff --git a/tests/disk_custom_blivet_software_raid.pm b/tests/disk_custom_blivet_software_raid.pm
index 4b067403..544bd26f 100644
--- a/tests/disk_custom_blivet_software_raid.pm
+++ b/tests/disk_custom_blivet_software_raid.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # 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(raid1 => 1, mountpoint => '/');
 
diff --git a/tests/disk_custom_blivet_standard_partition_ext4.pm b/tests/disk_custom_blivet_standard_partition_ext4.pm
index 135cc527..69c65982 100644
--- a/tests/disk_custom_blivet_standard_partition_ext4.pm
+++ b/tests/disk_custom_blivet_standard_partition_ext4.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # 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', mountpoint => '/');
diff --git a/tests/disk_custom_blivet_standard_partition_ext4_postinstall.pm b/tests/disk_custom_blivet_standard_partition_ext4_postinstall.pm
index 2509dbe3..ceb60ec6 100644
--- a/tests/disk_custom_blivet_standard_partition_ext4_postinstall.pm
+++ b/tests/disk_custom_blivet_standard_partition_ext4_postinstall.pm
@@ -4,21 +4,13 @@ use testapi;
 
 sub run {
     assert_screen "root_console";
-    my $count = 3;
-    my $devroot = 'vda2';
-    my $devboot = 'vda1';
-    if (get_var('OFW') || get_var('UEFI')) {
-        $count = 4;    # extra boot partition (PreP or ESP)
-        $devroot = 'vda3';
-        $devboot = 'vda2';
-    }
     # check number of partitions
     script_run 'fdisk -l | grep /dev/vda';    # debug
-    validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/$count/ };
+    validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/4/ };
     # check mounted partitions are ext4 fs
     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 "mount | grep /dev/vda2", sub { $_ =~ m/on \/boot type ext4/ };
+    validate_script_output "mount | grep /dev/vda3", sub { $_ =~ m/on \/ type ext4/ };
 }
 
 sub test_flags {
diff --git a/tests/disk_custom_blivet_with_swap.pm b/tests/disk_custom_blivet_with_swap.pm
index 039d1d44..a725cd4c 100644
--- a/tests/disk_custom_blivet_with_swap.pm
+++ b/tests/disk_custom_blivet_with_swap.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # 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 => 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 159ef5eb..2b8eac39 100644
--- a/tests/disk_custom_blivet_xfs.pm
+++ b/tests/disk_custom_blivet_xfs.pm
@@ -14,10 +14,14 @@ sub run {
         # if we're running on UEFI, we need esp
         custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
     }
-    if (get_var("OFW")) {
+    elsif (get_var("OFW")) {
         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');
     }
-
+    else {
+        # from anaconda-37.12.1 onwards, GPT is default for BIOS
+        # 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(filesystem => 'xfs', mountpoint => '/');
 
diff --git a/tests/disk_custom_lvm_ext4_postinstall.pm b/tests/disk_custom_lvm_ext4_postinstall.pm
index fc55dba7..a75bdb05 100644
--- a/tests/disk_custom_lvm_ext4_postinstall.pm
+++ b/tests/disk_custom_lvm_ext4_postinstall.pm
@@ -4,11 +4,7 @@ use testapi;
 
 sub run {
     assert_screen "root_console";
-    my $devboot = 'vda1';
 
-    if (get_var('OFW') || get_var('UEFI')) {
-        $devboot = 'vda2';
-    }
     # check that lvm is present:
     validate_script_output "lvdisplay | grep 'LV Status'", sub { $_ =~ m/available/ };
 
@@ -16,7 +12,7 @@ sub run {
     validate_script_output "lvs -o lv_attr", sub { $_ =~ m/wi-ao/ };
 
     # Check that the partitions are ext4.
-    validate_script_output "mount | grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ };
+    validate_script_output "mount | grep /dev/vda2", sub { $_ =~ m/on \/boot type ext4/ };
 
     # There should be one partition in the LVM.
     validate_script_output "mount | grep /dev/mapper", sub { $_ =~ m/on \/ type ext4/ };
diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm
index c7fa7e50..e7bd5353 100644
--- a/tests/disk_custom_standard_partition_ext4_postinstall.pm
+++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm
@@ -4,21 +4,13 @@ use testapi;
 
 sub run {
     assert_screen "root_console";
-    my $count = 3;
-    my $devroot = 'vda1';
-    my $devboot = 'vda2';
-    if (get_var('OFW') || get_var('UEFI')) {
-        $count = 4;    # extra boot partition (PreP or ESP)
-        $devroot = 'vda2';
-        $devboot = 'vda3';
-    }
     # check number of partitions
     script_run 'fdisk -l | grep /dev/vda';    # debug
-    validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/$count/ };
+    validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/4/ };
     # check mounted partitions are ext4 fs
     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 "mount | grep /dev/vda3", sub { $_ =~ m/on \/boot type ext4/ };
+    validate_script_output "mount | grep /dev/vda2", sub { $_ =~ m/on \/ type ext4/ };
 }
 
 sub test_flags {