diff --git a/.travis.yml b/.travis.yml
index 826a273..3f98ce5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
 language: ruby
 before_install:
-  - gem install bundler
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 rvm:
   - ruby-head
+  - 2.6
   - 2.5
   - 2.4
   - 2.3
@@ -17,34 +19,55 @@ gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.4
+      gemfile: gemfiles/rails_3.gemfile
     - rvm: 2.4
       gemfile: gemfiles/rails_4.gemfile
     - rvm: 2.4
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/rails_3.gemfile
     - rvm: 2.5
       gemfile: gemfiles/rails_4.gemfile
     - rvm: 2.5
       gemfile: gemfiles/rails_4.1.gemfile
     - rvm: 2.5
       gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_3.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_4.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.6
+      gemfile: gemfiles/rails_4.2.gemfile
   exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.2
+      gemfile: gemfiles/rails_6.0.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_6.0.gemfile
     - rvm: 2.0
       gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.0
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: 2.0
       gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_6.0.gemfile
 addons:
   code_climate:
     repo_token: 294f0ec8183176c0259b75eb21b38414508616985a7b39fc48fec9dfcf40a52e
diff --git a/Appraisals b/Appraisals
index ae603a3..094436a 100644
--- a/Appraisals
+++ b/Appraisals
@@ -27,3 +27,7 @@ end
 appraise "rails-5.2" do
  gem "rails", "~> 5.2.0"
 end
+
+appraise "rails-6.0" do
+ gem "rails", "~> 6.0.0.rc1"
+end
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
new file mode 100644
index 0000000..b8bc578
--- /dev/null
+++ b/gemfiles/rails_6.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0.rc1"
+
+gemspec path: "../"