diff --git a/.travis.yml b/.travis.yml
index 7e1b7a51..d2fd1f17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,20 +12,25 @@ rvm:
   - 2.3.8
   - 2.4.9
   - 2.5.7
+  - 2.6.5
+  - 2.7.0
   - ruby-head
 gemfile:
   - gemfiles/rails42.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
+  - gemfiles/rails60.gemfile
   - gemfiles/rails42_haml.gemfile
   - gemfiles/rails50_haml.gemfile
   - gemfiles/rails51_haml.gemfile
   - gemfiles/rails52_haml.gemfile
+  - gemfiles/rails60_haml.gemfile
   - gemfiles/rails42_boc.gemfile
   - gemfiles/rails50_boc.gemfile
   - gemfiles/rails51_boc.gemfile
   - gemfiles/rails52_boc.gemfile
+  - gemfiles/rails60_boc.gemfile
   - gemfiles/rack.gemfile
   - gemfiles/rack_boc.gemfile
   - gemfiles/pry09.gemfile
@@ -38,21 +43,57 @@ matrix:
     - gemfile: gemfiles/pry010.gemfile
     - gemfile: gemfiles/pry011.gemfile
   exclude:
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails60.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails60_boc.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails60_haml.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails42_boc.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails60.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails60_boc.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails60_haml.gemfile
     - rvm: 2.4.9
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.4.9
       gemfile: gemfiles/rails42_boc.gemfile
     - rvm: 2.4.9
       gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails60.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails60_boc.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails60_haml.gemfile
     - rvm: 2.5.7
       gemfile: gemfiles/rails42.gemfile
     - rvm: 2.5.7
       gemfile: gemfiles/rails42_boc.gemfile
     - rvm: 2.5.7
       gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails42_boc.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails42_boc.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails42_haml.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails42_boc.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails42_haml.gemfile
diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile
new file mode 100644
index 00000000..55f89c5e
--- /dev/null
+++ b/gemfiles/rails60.gemfile
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"
diff --git a/gemfiles/rails60_boc.gemfile b/gemfiles/rails60_boc.gemfile
new file mode 100644
index 00000000..190c573c
--- /dev/null
+++ b/gemfiles/rails60_boc.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "binding_of_caller"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"
diff --git a/gemfiles/rails60_haml.gemfile b/gemfiles/rails60_haml.gemfile
new file mode 100644
index 00000000..84d3401a
--- /dev/null
+++ b/gemfiles/rails60_haml.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "haml"
+
+gem 'coveralls', require: false
+
+gemspec path: "../"
diff --git a/spec/better_errors/stack_frame_spec.rb b/spec/better_errors/stack_frame_spec.rb
index 23a8982c..df96c90a 100644
--- a/spec/better_errors/stack_frame_spec.rb
+++ b/spec/better_errors/stack_frame_spec.rb
@@ -97,7 +97,7 @@ module BetterErrors
       it "raises on non-NameErrors" do
         frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index")
         allow(frame).to receive(:get_local_variable).and_raise(ArgumentError)
-        expect { frame.local_variable("foo") }.to raise_error
+        expect { frame.local_variable("foo") }.to raise_error(ArgumentError)
       end
     end
 
diff --git a/spec/better_errors_spec.rb b/spec/better_errors_spec.rb
index ef3d83c8..9d796105 100644
--- a/spec/better_errors_spec.rb
+++ b/spec/better_errors_spec.rb
@@ -41,7 +41,7 @@
     [:atom].each do |editor|
       it "uses atom:// scheme when set to #{editor.inspect}" do
         subject.editor = editor
-        subject.editor[].should start_with "atom://"
+        expect(subject.editor[]).to start_with "atom://"
       end
     end
 
@@ -82,7 +82,7 @@
       it "uses atom:// scheme when EDITOR=#{editor}" do
         ENV["EDITOR"] = editor
         subject.editor = subject.default_editor
-        subject.editor[].should start_with "atom://"
+        expect(subject.editor[]).to start_with "atom://"
       end
     end