diff --git a/needles/anaconda/partitioning/select_bootefi-20210219.json b/needles/anaconda/partitioning/select_bootefi-20210219.json
new file mode 100644
index 00000000..e8a1afec
--- /dev/null
+++ b/needles/anaconda/partitioning/select_bootefi-20210219.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 54,
+      "ypos": 407,
+      "width": 110,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_part_select_bootefi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/select_bootefi-20210219.png b/needles/anaconda/partitioning/select_bootefi-20210219.png
new file mode 100644
index 00000000..e8516580
Binary files /dev/null and b/needles/anaconda/partitioning/select_bootefi-20210219.png differ
diff --git a/tests/disk_custom_btrfs_preserve_home.pm b/tests/disk_custom_btrfs_preserve_home.pm
index bff41ddb..a76928e8 100644
--- a/tests/disk_custom_btrfs_preserve_home.pm
+++ b/tests/disk_custom_btrfs_preserve_home.pm
@@ -9,7 +9,10 @@ sub use_current_partition {
     my ($partition, $reformat) = @_;
 
     # Select the partition
-    assert_and_click "anaconda_part_select_$partition";
+    my $match = $partition;
+    # needle names can't have / in them
+    $match =~ s,/,,;
+    assert_and_click "anaconda_part_select_$match";
     # Select the mountpoint field
     send_key_until_needlematch("anaconda_part_mountpoint_selected", "tab", 20);
     # Type in the mountpoint
@@ -46,6 +49,8 @@ sub run {
     use_current_partition("home", 0);
     # Use the boot partition from the current scheme
     use_current_partition("boot", 1);
+    # Use /boot/efi from current scheme, if we're EFI
+    use_current_partition("boot/efi", 1) if (get_var "UEFI");
 
     # Select the root partition from the current scheme
     # and delete it