diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index dce8b3a0e..8b552e3b7 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -62,14 +62,16 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     FileUtils.rm downloaded_files
   end
 
-  def downloaded_files
-    Dir.glob("#{DOWNLOADS_PATH}/*").reject {|f| f=~/\.(tmp|crdownload)$/}
+  def downloaded_files(filename='*')
+    # https://github.com/SeleniumHQ/selenium/issues/5292
+    downloaded_path = Redmine::Platform.mswin? ? DOWNLOADS_PATH : "#{ENV['HOME']}/Downloads"
+    Dir.glob("#{downloaded_path}/#{filename}").reject {|f| f=~/\.(tmp|crdownload)$/}
   end
 
   # Returns the path of the download file
-  def downloaded_file
+  def downloaded_file(filename='*')
     Timeout.timeout(5) do
-      while downloaded_files.empty?
+      while downloaded_files(filename).empty?
         sleep 0.2
       end
     end
diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 28eccedbc..0ed93a08d 100644
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -335,7 +335,7 @@ class IssuesTest < ApplicationSystemTestCase
     click_on 'CSV'
     click_on 'Export'
 
-    csv = CSV.read(downloaded_file)
+    csv = CSV.read(downloaded_file("issues.csv"))
     subject_index = csv.shift.index('Subject')
     subjects = csv.map {|row| row[subject_index]}
     assert_equal subjects.sort, subjects