diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 0c4c14d2be5..ba354efb1cf 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -31,7 +31,13 @@ module FileStore
     end
 
     def upload_path
-      File.join("uploads", RailsMultisite::ConnectionManagement.current_db)
+      if  ENV['RAILS_ENV'] != "test" || !ENV['TEST_ENV_NUMBER']
+        return File.join("uploads", RailsMultisite::ConnectionManagement.current_db)
+      end
+
+      # Parallel spec system
+      n = ENV['TEST_ENV_NUMBER'].presence || '1'
+      File.join("uploads", RailsMultisite::ConnectionManagement.current_db, n)
     end
 
     def has_been_uploaded?(url)