diff --git a/common/test/acceptance/tests/lms/test_lms_edxnotes.py b/common/test/acceptance/tests/lms/test_lms_edxnotes.py
index cf0e050532..bcfe334122 100644
--- a/common/test/acceptance/tests/lms/test_lms_edxnotes.py
+++ b/common/test/acceptance/tests/lms/test_lms_edxnotes.py
@@ -842,7 +842,6 @@ class EdxNotesPageTest(EventsTestMixin, EdxNotesTestMixin):
 
         self.assert_viewed_event('Tags')
 
-    @flaky  # TNL-4590
     def test_easy_access_from_notes_page(self):
         """
         Scenario: Ensure that the link to the Unit works correctly.
@@ -874,27 +873,22 @@ class EdxNotesPageTest(EventsTestMixin, EdxNotesTestMixin):
 
         self._add_default_notes()
         self.notes_page.visit()
-        # visiting the page results in an ajax request to fetch the notes
-        self.notes_page.wait_for_ajax()
         note = self.notes_page.notes[0]
         assert_page(note, self.raw_note_list[4]['usage_id'], "Recent Activity")
 
-        self.notes_page.visit().switch_to_tab("structure")
-        # visiting the page results in an ajax request to fetch the notes
-        self.notes_page.wait_for_ajax()
+        self.notes_page.visit()
+        self.notes_page.switch_to_tab("structure")
         note = self.notes_page.notes[1]
         assert_page(note, self.raw_note_list[2]['usage_id'], "Location in Course")
 
-        self.notes_page.visit().switch_to_tab("tags")
-        # visiting the page results in an ajax request to fetch the notes
-        self.notes_page.wait_for_ajax()
+        self.notes_page.visit()
+        self.notes_page.switch_to_tab("tags")
         note = self.notes_page.notes[0]
         assert_page(note, self.raw_note_list[2]['usage_id'], "Tags")
 
-        self.notes_page.visit().search("Fifth")
-        # visiting the page results in an ajax request to fetch the notes
+        self.notes_page.visit()
+        self.notes_page.search("Fifth")
         self.notes_page.wait_for_ajax()
-
         note = self.notes_page.notes[0]
         assert_page(note, self.raw_note_list[4]['usage_id'], "Search Results")
 
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 37c0fe861f..1b3772583a 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -90,6 +90,11 @@ XQUEUE_INTERFACE['url'] = 'http://localhost:8040'
 EDXNOTES_PUBLIC_API = 'http://localhost:8042/api/v1'
 EDXNOTES_INTERNAL_API = 'http://localhost:8042/api/v1'
 
+
+EDXNOTES_CONNECT_TIMEOUT = 10  # time in seconds
+EDXNOTES_READ_TIMEOUT = 10  # time in seconds
+
+
 NOTES_DISABLED_TABS = []
 
 # Silence noisy logs