diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index 1f400a82..3f517fb0 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -321,7 +321,8 @@ sub check_help_on_pane {
     # and Installation progress Help button. For the aforementioned
     # step, we are skipping selecting the panes.
     if ($screen ne "main" && $screen ne "language_selection" && $screen ne "installation_progress") {
-        assert_and_click "anaconda_main_hub_$screen";
+        send_key_until_needlematch("anaconda_main_hub_$screen", "shift-tab");
+        click_lastmatch;
     }
     # For Help, click on the the Help button.
     assert_and_click "anaconda_help_button";
@@ -350,7 +351,10 @@ sub check_help_on_pane {
     # In the situation, when we do not arrive at main hub, we will skip
     # testing that main hub is shown.
     if ($screen ne "language_selection" && $screen ne "installation_progress") {
-    assert_screen "anaconda_main_hub";
+        # on leaving a spoke, it is highlighted on the main hub, which
+        # can throw off the match here. so we'll try hitting shift-tab
+        # a few times to shift focus
+        send_key_until_needlematch("anaconda_main_hub", "shift-tab");
     }
 }
 
diff --git a/needles/anaconda/main_hub/nonlive-firstcol.json b/needles/anaconda/main_hub/nonlive-firstcol.json
deleted file mode 100644
index 19cdba53..00000000
--- a/needles/anaconda/main_hub/nonlive-firstcol.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 199,
-      "xpos": 485,
-      "type": "match",
-      "height": 33,
-      "width": 33
-    },
-    {
-      "width": 28,
-      "height": 34,
-      "ypos": 272,
-      "type": "match",
-      "xpos": 488
-    },
-    {
-      "ypos": 267,
-      "type": "match",
-      "xpos": 722,
-      "width": 34,
-      "height": 37
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_main_hub",
-    "ENV-DISTRI-fedora"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/nonlive-firstcol.png b/needles/anaconda/main_hub/nonlive-firstcol.png
deleted file mode 100644
index cdc88efe..00000000
Binary files a/needles/anaconda/main_hub/nonlive-firstcol.png and /dev/null differ
diff --git a/needles/anaconda/main_hub/nonlive-othercols.json b/needles/anaconda/main_hub/nonlive-othercols.json
deleted file mode 100644
index a4d08fdc..00000000
--- a/needles/anaconda/main_hub/nonlive-othercols.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 268,
-      "xpos": 248,
-      "type": "match",
-      "height": 33,
-      "width": 33
-    },
-    {
-      "type": "match",
-      "xpos": 244,
-      "ypos": 199,
-      "width": 41,
-      "height": 34
-    },
-    {
-      "ypos": 336,
-      "xpos": 246,
-      "type": "match",
-      "width": 34,
-      "height": 37
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_main_hub",
-    "ENV-DISTRI-fedora"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/nonlive-othercols.png b/needles/anaconda/main_hub/nonlive-othercols.png
deleted file mode 100644
index 39205b46..00000000
Binary files a/needles/anaconda/main_hub/nonlive-othercols.png and /dev/null differ
diff --git a/tests/anaconda_help.pm b/tests/anaconda_help.pm
index 202a72b0..2efced71 100644
--- a/tests/anaconda_help.pm
+++ b/tests/anaconda_help.pm
@@ -26,24 +26,24 @@ sub run {
     my @testplan;
     # For LIVE KDE:
     if ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) {
-    	@testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/;
+        @testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/;
     }
     # For LIVE Workstation
     elsif ((get_var('LIVE')) && (get_var('DESKTOP') eq "gnome")) {
-    	@testplan = qw/keyboard_layout install_destination time_date/;
+        @testplan = qw/keyboard_layout install_destination time_date/;
     }
     # For Silverblue
     elsif (get_var('DESKTOP') eq "gnome") {
-    	@testplan = qw/keyboard_layout language_support install_destination time_date/;
+        @testplan = qw/keyboard_layout language_support install_destination time_date/;
     }
     # For ServerDVD
     else {
-    	@testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password create_user/;
+        @testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password create_user/;
     }
 
     # Iterate over test plan and do the tests.
     foreach (@testplan) {
-    	check_help_on_pane($_);
+        check_help_on_pane($_);
     }
 
     # Now, we will start the installation.
@@ -51,16 +51,17 @@ sub run {
     # the Begin Installation button may be greyed out. If this is the situation,
     # we will create the root password to override this.
     unless (check_screen "anaconda_main_hub_begin_installation", 120) {
-	    assert_and_click "anaconda_main_hub_root_password";
-	    type_safely "weakrootpassword";
-	    send_key "tab";
-	    type_safely "weakrootpassword";
-	    assert_and_click "anaconda_spoke_done";
+        assert_and_click "anaconda_main_hub_root_password";
+        type_safely "weakrootpassword";
+        send_key "tab";
+        type_safely "weakrootpassword";
+        assert_and_click "anaconda_spoke_done";
     }
-    # Begin installation
-    assert_and_click "anaconda_main_hub_begin_installation";
+    # Begin installation after waiting out animation
+    wait_still_screen 5;
+    wait_screen_change { assert_and_click "anaconda_main_hub_begin_installation"; };
 
-    # Check the last Help screen. As
+    # Check the last Help screen
     check_help_on_pane("installation_progress");
 
     # As there is no need to proceed with the installation,