diff --git a/config/environments/production.rb b/config/environments/production.rb
index ffbb5786130..1db114e1630 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -20,7 +20,7 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/recovery.rb b/config/environments/recovery.rb
index cec0e5d2ee4..58610130d09 100644
--- a/config/environments/recovery.rb
+++ b/config/environments/recovery.rb
@@ -14,7 +14,7 @@
     config.action_controller.perform_caching = true
     config.action_dispatch.x_sendfile_header = "X-Sendfile"
     config.active_support.deprecation = :notify
-    config.serve_static_assets = true
+    config.serve_static_files = true
     config.i18n.fallbacks = true
 
     config.action_dispatch.session = {
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index cc0b9f0b661..7c5c19d6f37 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -20,7 +20,7 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index dd76d536857..05ccc59f038 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -40,6 +40,8 @@
 
   require 'clearance_backdoor'
   config.middleware.use ClearanceBackdoor
+
+  config.active_support.test_order = :random
 end
 
 ENV['S3_KEY']    = 'this:is:an:ex:parrot'