diff --git a/.travis.yml b/.travis.yml
index 5dc469e..bc82c1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,23 +11,26 @@ 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.6.3"
 matrix:
   exclude:
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: "2.2"
       gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: "2.2"
       gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: "2.2"
       gemfile: gemfiles/rails_5_2.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/devise-two-factor.gemspec b/devise-two-factor.gemspec
index a60f560..3039797 100644
--- a/devise-two-factor.gemspec
+++ b/devise-two-factor.gemspec
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'railties',       '< 5.3'
-  s.add_runtime_dependency 'activesupport',  '< 5.3'
+  s.add_runtime_dependency 'railties',       '< 7'
+  s.add_runtime_dependency 'activesupport',  '< 7'
   s.add_runtime_dependency 'attr_encrypted', '>= 1.3', '< 4', '!= 2'
   s.add_runtime_dependency 'devise',         '~> 4.0'
   s.add_runtime_dependency 'rotp',           '~> 2.0'
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
new file mode 100644
index 0000000..684ff0e
--- /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.rc1"
+gem "activesupport", "6.0.0.rc1"
+
+gemspec path: "../"