diff --git a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
index 57bdd813cd5..8e98c1f1569 100644
--- a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
+++ b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
@@ -217,7 +217,7 @@ Feature: Within the grader report, test that we can search for users
       | -1-                |
       | Teacher 1          |
 
-  @accessibility
+  @accessibility @matt
   Scenario: A teacher can set focus and search using the input are with a keyboard
     # Basic tests for the page.
     Given the page should meet accessibility standards
@@ -245,7 +245,6 @@ Feature: Within the grader report, test that we can search for users
     And the focused element is "Search users" "field"
     # Lets check the tabbing order.
     And I set the field "Search users" to "ABC"
-    And I wait "3" seconds
     And I wait until "View all results for \"ABC\"" "button" exists
     And I press the tab key
     And the focused element is "Clear search input" "button"
@@ -278,6 +277,23 @@ Feature: Within the grader report, test that we can search for users
     And I press the enter key
     And I wait until the page is ready
     And I should not see "Turtle Manatee"
+    # Special tab testing.
+    And I set the field "Search users" to "ABC"
+    And I wait until "View all results for \"ABC\"" "button" exists
+    And I press the down key
+    And I press the tab key
+    And the focused element is "View all results for \"ABC\"" "button"
+    And I press the shift tab key
+    And "Turtle Manatee" "list_item" should exist in the ".user-search" "css_element"
+    # Focus should be on first item of user list.
+    And I press the shift tab key
+    And the focused element is "Clear search input" "button"
+    And I set the field "Search users" to "AB"
+    And I press the tab key
+    And I press the tab key
+    And I press the shift tab key
+    And the field "Search users" matches value "AB"
+    And "Turtle Manatee" "list_item" should exist in the ".user-search" "css_element"
 
   Scenario: Once a teacher searches, it'll apply the currently set filters and inform the teacher as such
     # Set up a basic filtering case.