diff --git a/src/discussions/in-context-topics/TopicPostsView.test.jsx b/src/discussions/in-context-topics/TopicPostsView.test.jsx
index 4fef3e1e..95a11092 100644
--- a/src/discussions/in-context-topics/TopicPostsView.test.jsx
+++ b/src/discussions/in-context-topics/TopicPostsView.test.jsx
@@ -29,15 +29,13 @@ import '../posts/data/__factories__/threads.factory';
 
 const courseId = 'course-v1:edX+DemoX+Demo_Course';
 const threadsApiUrl = getThreadsApiUrl();
-const topicsApiUrl = `${getCourseTopicsApiUrl()}`;
+const topicsApiUrl = getCourseTopicsApiUrl();
 let store;
 let axiosMock;
 let lastLocation;
 let container;
 
-async function renderComponent({
-  topicId, category,
-} = { }) {
+async function renderComponent({ topicId, category } = { }) {
   let path = `/${courseId}/topics`;
   if (topicId) {
     path = generatePath(Routes.POSTS.PATH, { courseId, topicId });
@@ -214,7 +212,7 @@ describe('InContext Topic Posts View', () => {
       await renderComponent();
 
       const searchField = await within(container).getByPlaceholderText('Search topics');
-      const searchButton = container.querySelector('[data-test-id = "search-icon"]');
+      const searchButton = await within(container).getByTestId('search-icon');
       fireEvent.change(searchField, { target: { value: searchText } });
 
       await waitFor(async () => expect(searchField).toHaveValue(searchText));
@@ -236,7 +234,8 @@ describe('InContext Topic Posts View', () => {
 
     const searchText = 'hello world';
     const searchField = await within(container).getByPlaceholderText('Search topics');
-    const searchButton = container.querySelector('[data-test-id = "search-icon"]');
+    const searchButton = await within(container).getByTestId('search-icon');
+
     fireEvent.change(searchField, { target: { value: searchText } });
 
     await waitFor(async () => expect(searchField).toHaveValue(searchText));
diff --git a/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx b/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx
index efcbab27..6766bb40 100644
--- a/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx
+++ b/src/discussions/in-context-topics/topic-search/TopicSearchBar.jsx
@@ -50,7 +50,7 @@ function TopicSearchBar({ intl }) {
           <Icon
             src={SearchIcon}
             onClick={() => onSubmit(searchValue)}
-            data-test-id="search-icon"
+            data-testid="search-icon"
           />
         </span>
       </SearchField.Advanced>