diff --git a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
index 6d5aa8dd1a8d98879e67fb38092e8332788741c7..ec399414c26fb3e688c10d99760a8b5f624e3240 100644
--- a/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
+++ b/tests/features/varbase/step2-apply-tests/03-admin-management/03-04-image-media-and-their-usage-list-page-for-admins.feature
@@ -8,7 +8,7 @@ So that I will be able to manage files, see where they have been used in content
 
   @javascript @local @development @staging @production
   Scenario: Check if content admins can access the content files page
-     When I go to "admin/content/media-table"
+     When I go to "admin/content/media"
       And I wait
      Then I should see "Add media"
       And I should not see "Access denied"
@@ -30,13 +30,13 @@ So that I will be able to manage files, see where they have been used in content
        And I wait
       Then I should see "Flag Earth"
        And I wait
-      When I go to "admin/content/media-table"
+      When I go to "admin/content/media"
       Then I should see "Add media"
        And I should see the "Edit" in the "Flag Earth" row
 
   @javascript @local @development @staging @production
   Scenario: Check if content admins can edit files
-     When I go to "admin/content/media-table"
+     When I go to "admin/content/media"
       And I wait
      Then I should see "Add media"
      When I fill in "Flag Earth" for "edit-name"
@@ -54,7 +54,7 @@ So that I will be able to manage files, see where they have been used in content
 
   @javascript @local @development @staging @production
   Scenario: Check if content admins can delete files
-     When I go to "admin/content/media-table"
+     When I go to "admin/content/media"
       And I wait
      Then I should see "Add media"
      When I fill in "Flag Earth after edit" for "edit-name"
@@ -69,4 +69,4 @@ So that I will be able to manage files, see where they have been used in content
      Then I should see "This action cannot be undone."
      When I press the "Delete" button
       And I wait
-     Then I should see "The media Flag Earth after edit has been deleted."
+     Then I should see "The media item Flag Earth after edit has been deleted."
diff --git a/tests/features/varbase/step3-cleanup-tests/04-cleanup-leftover-media-in-the-media-library.feature b/tests/features/varbase/step3-cleanup-tests/04-cleanup-leftover-media-in-the-media-library.feature
index c30249ce8be7f42bb372f62b885ed2d6532f30ab..28df7c7e10d164a9cf41a385fa04ac2dec28ba0a 100644
--- a/tests/features/varbase/step3-cleanup-tests/04-cleanup-leftover-media-in-the-media-library.feature
+++ b/tests/features/varbase/step3-cleanup-tests/04-cleanup-leftover-media-in-the-media-library.feature
@@ -3,7 +3,7 @@ Feature: Cleanup leftover media from the Media Library
 @javascript @cleanup @local @development
 Scenario: Delete leftover media from the Media Library
   Given I am a logged in user with the "webmaster" user
-   When I go to "/admin/content/media"
+   When I go to "/admin/content/media-grid"
     And I wait
    Then I should see "Media"
    When I check the box "edit-select-all"