diff --git a/.travis.yml b/.travis.yml
index f18505bc8..0f81256ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,9 @@ rvm:
   - 2.7
 
 env:
-  - RAILS_VERSION=4
-  - RAILS_VERSION=5
+  - RAILS_VERSION=4.2
+  - RAILS_VERSION=5.2
+  - RAILS_VERSION=6.0
   - RAILS_VERSION=0
 
 addons:
@@ -36,16 +37,22 @@ before_install:
 matrix:
   include:
     - rvm: jruby-9.2.11.1
-      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=4
+      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=4.2
     - rvm: jruby-9.2.11.1
-      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=5
+      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=5.2
+    - rvm: jruby-9.2.11.1
+      env: JRUBY_OPTS="--dev -J-Djruby.launch.inproc=true -J-Xmx1024M" RAILS_VERSION=6.0
     - rvm: 2.7
-      env: RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
+      env: RAILS_VERSION=6.0 RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal"
     - rvm: ruby-head
       env: RAILS_VERSION=0
   exclude:
+    - rvm: 2.3
+      env: RAILS_VERSION=6.0
+    - rvm: 2.4
+      env: RAILS_VERSION=6.0
     - rvm: 2.7
-      env: RAILS_VERSION=4
+      env: RAILS_VERSION=4.2
 
   allow_failures:
     - rvm: ruby-head
diff --git a/Gemfile b/Gemfile
index b62bdb26c..9c6e3c9a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,13 +2,10 @@ source "https://rubygems.org/"
 
 gemspec
 
-if ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 4)
-  gem "rails", "~> 4.2"
-  gem "rspec-rails", "~> 4.0"
-elsif ENV["RAILS_VERSION"] && (ENV["RAILS_VERSION"].to_i == 0)
-  # no-op. No Rails.
-else
-  gem "rails", "~> 5.2"
+rails_version = ENV["RAILS_VERSION"].to_f
+
+if rails_version != 0
+  gem "rails", "~> #{rails_version}"
   gem "rspec-rails", "~> 4.0"
 end
 
diff --git a/lib/raven/integrations/rails.rb b/lib/raven/integrations/rails.rb
index 307775b59..ac799ea79 100644
--- a/lib/raven/integrations/rails.rb
+++ b/lib/raven/integrations/rails.rb
@@ -5,6 +5,7 @@ class Rails < ::Rails::Railtie
     require 'raven/integrations/rails/overrides/streaming_reporter'
     require 'raven/integrations/rails/controller_methods'
     require 'raven/integrations/rails/controller_transaction'
+    require 'raven/integrations/rack'
 
     initializer "raven.use_rack_middleware" do |app|
       app.config.middleware.insert 0, Raven::Rack
diff --git a/spec/support/test_rails_app/app.rb b/spec/support/test_rails_app/app.rb
index accd34af9..27a89c417 100644
--- a/spec/support/test_rails_app/app.rb
+++ b/spec/support/test_rails_app/app.rb
@@ -17,6 +17,8 @@ class TestApp < Rails::Application
   # Usually set for us in production.rb
   config.eager_load = true
 
+  config.hosts = nil
+
   routes.append do
     get "/exception", :to => "hello#exception"
     root :to => "hello#world"