diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot-20201216.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive-20201216.json
similarity index 74%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot-20201216.json
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive-20201216.json
index f6ce9cda..4279c7b1 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot-20201216.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive-20201216.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_part_inactive_boot"
+    "anaconda_blivet_part_boot"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot-20201216.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive-20201216.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot-20201216.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive-20201216.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive.json
similarity index 79%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive.json
index a2e1ad7e..ceb65cb5 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_part_inactive_boot"
+    "anaconda_blivet_part_boot"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_boot.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot-inactive.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.json
deleted file mode 100644
index 19c93bbb..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 342,
-      "ypos": 307,
-      "width": 112,
-      "height": 18,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_boot_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.png
deleted file mode 100644
index 89923075..00000000
Binary files a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_boot_selected.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi_selected.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi-selected.json
similarity index 75%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi_selected.json
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi-selected.json
index d63e94a1..f9d38f87 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi_selected.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi-selected.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_part_efi_selected"
+    "anaconda_blivet_part_efi"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi_selected.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi-selected.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi_selected.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_efi-selected.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_home.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home-inactive.json
similarity index 74%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_home.json
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_home-inactive.json
index 4d1993d7..d6e3c6f0 100644
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_home.json
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home-inactive.json
@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_part_inactive_home"
+    "anaconda_blivet_part_home"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_home.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home-inactive.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_home.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_home-inactive.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.json
deleted file mode 100644
index a5719df1..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 264,
-      "height": 19,
-      "ypos": 330,
-      "width": 40,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_home_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.png
deleted file mode 100644
index 27fc6d9d..00000000
Binary files a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_home_selected.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.json
deleted file mode 100644
index ea4fac98..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 17,
-      "width": 108,
-      "ypos": 308,
-      "type": "match",
-      "xpos": 340
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_inactive_efi"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.png
deleted file mode 100644
index c5c879c4..00000000
Binary files a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_inactive_efi.png and /dev/null differ
diff --git a/tests/disk_custom_blivet_btrfs_preserve_home.pm b/tests/disk_custom_blivet_btrfs_preserve_home.pm
index c27997d2..b1eef763 100644
--- a/tests/disk_custom_blivet_btrfs_preserve_home.pm
+++ b/tests/disk_custom_blivet_btrfs_preserve_home.pm
@@ -13,11 +13,10 @@ sub run {
 
     if (get_var("UEFI")) {
         # if we're running on UEFI, let us reformat the UEFI first
-        # Select the UEFI partition if it is not selected by default
-        if (not(check_screen "anaconda_blivet_part_efi_selected", 30)) {
-            assert_and_click "anaconda_blivet_part_inactive_efi";
-            wait_still_screen 5;
-        }
+        # Select the UEFI partition if it is not selected by default;
+        # if it is, clicking it is harmless
+        assert_and_click "anaconda_blivet_part_efi";
+        wait_still_screen 5;
 
         # Go to the partition settings
         assert_and_click "anaconda_blivet_part_edit";
@@ -35,13 +34,8 @@ sub run {
     }
 
     # Reformat the /boot partition
-    if (check_screen "anaconda_blivet_part_boot_selected", 30) {
-        assert_and_click "anaconda_blivet_part_boot_selected";
-    }
-    else {
-        assert_and_click "anaconda_blivet_part_inactive_boot";
-        wait_still_screen 5;
-    }
+    assert_and_click "anaconda_blivet_part_boot";
+    wait_still_screen 5;
 
     # Go to the partition settings
     assert_and_click "anaconda_blivet_part_edit";
@@ -60,9 +54,7 @@ sub run {
     assert_and_click "anaconda_blivet_volumes_icon";
 
     # Select the home partition
-    if (not(check_screen "anaconda_blivet_part_home_selected")) {
-        assert_and_click "anaconda_blivet_part_inactive_home";
-    }
+    assert_and_click "anaconda_blivet_part_home";
     # Go to the partition settings
     assert_and_click "anaconda_blivet_part_edit";
     # Select the Set mountpoint option