diff --git a/awx/ui/test/e2e/objects/sections/search.js b/awx/ui/test/e2e/objects/sections/search.js
index 9feed81554..64fd557da5 100644
--- a/awx/ui/test/e2e/objects/sections/search.js
+++ b/awx/ui/test/e2e/objects/sections/search.js
@@ -2,8 +2,8 @@ const search = {
     selector: 'smart-search',
     locateStrategy: 'css selector',
     elements: {
-        clearAll: 'a[class*="clear"]',
-        searchButton: 'i[class$="search"]',
+        clearAll: 'a[class*="clearAll"]',
+        searchButton: 'i[class*="fa-search"]',
         input: 'input',
         tags: '.SmartSearch-tagContainer'
     }
diff --git a/awx/ui/test/e2e/tests/test-xss.js b/awx/ui/test/e2e/tests/test-xss.js
index 5e2e2b0fbe..719fbd3ae2 100644
--- a/awx/ui/test/e2e/tests/test-xss.js
+++ b/awx/ui/test/e2e/tests/test-xss.js
@@ -511,11 +511,11 @@ module.exports = {
         const itemRow = `#projects_table tr[id="${data.project.id}"]`;
         const itemName = `${itemRow} td[class*="name-"] a`;
 
-        client.expect.element('div[class^="at-Panel"] smart-search').visible;
-        client.expect.element('div[class^="at-Panel"] smart-search input').enabled;
+        client.expect.element('div[class*="at-Panel"] smart-search').visible;
+        client.expect.element('div[class*="at-Panel"] smart-search input').enabled;
 
-        client.sendKeys('div[class^="at-Panel"] smart-search input', `id:>${data.project.id - 1} id:<${data.project.id + 1}`);
-        client.sendKeys('div[class^="at-Panel"] smart-search input', client.Keys.ENTER);
+        client.sendKeys('div[class*="at-Panel"] smart-search input', `id:>${data.project.id - 1} id:<${data.project.id + 1}`);
+        client.sendKeys('div[class*="at-Panel"] smart-search input', client.Keys.ENTER);
 
         client.expect.element('div.spinny').visible;
         client.expect.element('div.spinny').not.visible;