diff --git a/README.md b/README.md
index 4ceca148d4..810345d66f 100644
--- a/README.md
+++ b/README.md
@@ -21,13 +21,6 @@ gem 'bootstrap-sass', '~> 3.3.1'
 gem 'sass-rails', '>= 3.2'
 ```
 
-Bootstrap requires the use of [Autoprefixer](https://github.com/ai/autoprefixer-rails)
-to add browser vendor prefixes automatically. Simply add the gem:
-
-```ruby
-gem 'autoprefixer-rails'
-```
-
 `bundle install` and restart your server to make the files available through the pipeline.
 
 Import Bootstrap styles in `app/assets/stylesheets/application.css.scss`:
diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec
index a938a54dbb..b07f39c783 100644
--- a/bootstrap-sass.gemspec
+++ b/bootstrap-sass.gemspec
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.license  = 'MIT'
 
   s.add_runtime_dependency 'sass', '~> 3.2'
+  s.add_runtime_dependency 'autoprefixer-rails', '~> 5.0'
 
   # Testing dependencies
   s.add_development_dependency 'minitest', '~> 5.4.0'
@@ -24,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'activesupport', '>= 4.1.5'
   s.add_development_dependency 'json', '>= 1.8.1'
   s.add_development_dependency 'sprockets-rails', '>= 2.1.3'
-  s.add_development_dependency 'autoprefixer-rails', '~> 1.1'
   s.add_development_dependency 'jquery-rails', '>= 3.1.0'
   s.add_development_dependency 'slim-rails'
   s.add_development_dependency 'uglifier'
diff --git a/test/dummy_rails/config/environments/test.rb b/test/dummy_rails/config/environments/test.rb
index 59c6a96c5a..0ad21d01e3 100644
--- a/test/dummy_rails/config/environments/test.rb
+++ b/test/dummy_rails/config/environments/test.rb
@@ -26,5 +26,7 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  config.active_support.test_order = :random
+
   config.active_support.deprecation = :stderr
 end