diff --git a/apps/dashboard/test/system/batch_connect_widgets_test.rb b/apps/dashboard/test/system/batch_connect_widgets_test.rb
index 9d51eae12..ce7bad488 100644
--- a/apps/dashboard/test/system/batch_connect_widgets_test.rb
+++ b/apps/dashboard/test/system/batch_connect_widgets_test.rb
@@ -177,6 +177,8 @@ def make_bc_app(dir, form)
 
       click_on 'Select Path'
 
+      sleep 1
+
       table_id = "batch_connect_session_context_path_path_selector_table"
       shown_dirs_and_files = find_all("##{table_id} tr td").map { |td| td["innerHTML"] }
 
diff --git a/apps/dashboard/test/system/remote_files_test.rb b/apps/dashboard/test/system/remote_files_test.rb
index 541224b03..b3eece379 100644
--- a/apps/dashboard/test/system/remote_files_test.rb
+++ b/apps/dashboard/test/system/remote_files_test.rb
@@ -309,7 +309,9 @@ def setup
         find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
 
         find('tbody a', exact_text: 'foo').click
+
         # Need to wait until we're in the new directory before clicking upload
+        sleep 1
         assert_no_selector 'tbody a', exact_text: 'foo', wait: MAX_WAIT
 
         find('#upload-btn').click
@@ -318,18 +320,7 @@ def setup
         src_file = 'test/fixtures/files/upload/hello-world.c'
         attach_file 'files[]', src_file, visible: false, match: :first
         find('.uppy-StatusBar-actionBtn--upload', wait: MAX_WAIT).click
-
-      # TODO: Investigate why this upload is failing the first time in the first place.
-       begin
-          find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
-        rescue
-          find('#upload-btn').click
-          find('.uppy-Dashboard-AddFiles', wait: MAX_WAIT)
-          attach_file 'files[]', src_file, visible: false, match: :first
-          find('.uppy-StatusBar-actionBtn--upload', wait: MAX_WAIT).click
-
-          find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
-        end
+        find('tbody a', exact_text: File.basename(src_file), wait: MAX_WAIT)
       end
     end
   end