diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index beff6a868..efe6897da 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -190,7 +190,7 @@ def test_should_show_job_in_progress(
         "0 delivered text messages",
         "0 failed text messages",
     ]
-    assert page.select_one("p.hint").text.strip() == "Report is 50% complete…"
+    assert page.select_one("p.usa-hint").text.strip() == "Report is 50% complete…"
 
 
 def test_should_show_job_without_notifications(
@@ -217,7 +217,7 @@ def test_should_show_job_without_notifications(
         "0 delivered text messages",
         "0 failed text messages",
     ]
-    assert page.select_one("p.hint").text.strip() == "Report is 50% complete…"
+    assert page.select_one("p.usa-hint").text.strip() == "Report is 50% complete…"
     assert page.select_one("tbody").text.strip() == "No messages to show yet…"
 
 
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index 113aae861..3098ed93b 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -409,11 +409,10 @@ def test_should_show_templates_folder_page(
         assert normalize_spaces(all_searchable_text[index].text) == expected_item
 
     if expected_empty_message:
-        assert normalize_spaces(page.select_one(".template-list-empty").text) == (
+        empty_messages = [p for p in page.select("p.text-base") if "No templates found" not in p.text]
+        assert empty_messages and normalize_spaces(empty_messages[0].text) == (
             expected_empty_message
         )
-    else:
-        assert not page.select(".template-list-empty")
 
     mock_get_service_templates.assert_called_once_with(SERVICE_ONE_ID)
 
@@ -1802,8 +1801,9 @@ def test_should_filter_templates_folder_page_based_on_user_permissions(
     ] == expected_items
 
     if expected_empty_message:
-        assert normalize_spaces(page.select_one(".template-list-empty").text) == (
+        # Look for the empty folder message specifically, not the live search no results message
+        # The empty folder message is in a div > p.text-base structure, whereas search no results is different
+        empty_messages = [p for p in page.select("p.text-base") if "No templates found" not in p.text]
+        assert empty_messages and normalize_spaces(empty_messages[0].text) == (
             expected_empty_message
         )
-    else:
-        assert not page.select(".template-list-empty")