diff --git a/.travis.yml b/.travis.yml
index 5dc469e..8966f00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 before_install:
-  - gem update --system
+  - gem i rubygems-update -v '<3' && update_rubygems
   - gem update bundler
 gemfile:
   - Gemfile
@@ -11,12 +11,15 @@ gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 rvm:
   - "2.1"
   - "2.2"
   - "2.3.4"
   - "2.4.0"
   - "2.4.1"
+  - "2.5"
+  - "2.6"
 matrix:
   exclude:
     - rvm: "2.1"
@@ -31,3 +34,13 @@ matrix:
       gemfile: gemfiles/rails_5_2.gemfile
     - rvm: "2.2"
       gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: "2.1"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.2"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.3.4"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.4.0"
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: "2.4.1"
+      gemfile: gemfiles/rails_6_0.gemfile
diff --git a/Appraisals b/Appraisals
index bcb464a..708ec84 100644
--- a/Appraisals
+++ b/Appraisals
@@ -22,3 +22,8 @@ appraise "rails-5-2" do
   gem 'railties', '~> 5.2'
   gem 'activesupport', '~> 5.2'
 end
+
+appraise "rails-6-0" do
+  gem 'railties', '~> 6.0'
+  gem 'activesupport', '~> 6.0'
+end
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
new file mode 100644
index 0000000..d683384
--- /dev/null
+++ b/gemfiles/rails_6_0.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 6.0.0.rc2"
+gem "activesupport", "~> 6.0.0.rc2"
+
+gemspec path: "../"