diff --git a/spec/support/downloads_helper.rb b/spec/support/downloads_helper.rb
index a85bcca55b..a9cf3cf60d 100644
--- a/spec/support/downloads_helper.rb
+++ b/spec/support/downloads_helper.rb
@@ -4,7 +4,7 @@ module DownloadsHelper
   TIMEOUT = 10
 
   def self.path
-    Rails.root.join("tmp", "downloads")
+    Rails.root.join("tmp", "capybara")
   end
 
   def downloaded_filename
@@ -17,16 +17,10 @@ module DownloadsHelper
     File.read(downloaded_filename)
   end
 
-  def with_empty_downloads_folder
-    remove_downloaded_files
-    yield
-    remove_downloaded_files
-  end
-
   private
 
   def downloaded_filenames
-    Dir[DownloadsHelper.path.join("*")]
+    Dir[DownloadsHelper.path.join("*")].select { |f| File.file?(f) }
   end
 
   def wait_for_download
diff --git a/spec/system/support/cuprite_setup.rb b/spec/system/support/cuprite_setup.rb
index 07a42e7039..18ae445ede 100644
--- a/spec/system/support/cuprite_setup.rb
+++ b/spec/system/support/cuprite_setup.rb
@@ -38,5 +38,6 @@ RSpec.configure do |config|
       "#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}"
     example.run
     Rails.application.default_url_options[:host] = original_host
+    remove_downloaded_files
   end
 end