diff --git a/.travis.yml b/.travis.yml
index 8ca540b..013f097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,33 @@
 language: ruby
+
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - 2.4.1
+  - 2.4.10
+  - 2.5.9
+  - 2.7.4
+  - 3.0.0
+
 env:
   - RAILS_VERSION=4.2
-  - RAILS_VERSION=5.0
+  - RAILS_VERSION=5.2
+  - RAILS_VERSION=6.0
+  - RAILS_VERSION=6.1
+
+jobs:
+  exclude:
+    - rvm: 2.5.9
+      env: RAILS_VERSION=4.2
+    - rvm: 2.7.4
+      env: RAILS_VERSION=4.2
+    - rvm: 3.0.0
+      env: RAILS_VERSION=4.2
+    - rvm: 3.0.0
+      env: RAILS_VERSION=5.2
+    - rvm: 3.0.0
+      env: RAILS_VERSION=6.0
+    - rvm: 2.4.10
+      env: RAILS_VERSION=6.0
+    - rvm: 2.4.10
+      env: RAILS_VERSION=6.1
 
 before_install:
   - gem install bundler -v 1.15
diff --git a/Gemfile b/Gemfile
index d1d63da..e831a9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,17 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in devise-async.gemspec
 gemspec
 
-case version = ENV['RAILS_VERSION'] || "~> 5.0"
-when /5/
-  gem "activerecord", "~> 5.0"
-  gem "actionpack", "~> 5.0"
-  gem "actionmailer", "~> 5.0"
-when /4.2/
-  gem "activerecord", "~> 4.2"
-  gem "actionpack", "~> 4.2"
-  gem "actionmailer", "~> 4.2"
+version = ENV['RAILS_VERSION'] || "~> 6.1"
+
+gem "activerecord", version
+gem "actionpack", version
+gem "actionmailer", version
+
+if version =~ /^4/
+  gem 'sqlite3', '~> 1.3'
 else
-  gem "activerecord", version
-  gem "actionpack", version
-  gem "actionmailer", version
+  gem 'sqlite3'
 end
diff --git a/README.md b/README.md
index 5c4d77c..7528adb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Devise Async
 
-[![Tag](https://img.shields.io/github/tag/mhfs/devise-async.svg?style=flat-square)](https://github.com/mhfs/devise-async/releases) [![Build Status](https://img.shields.io/travis/mhfs/devise-async.svg?style=flat-square)](https://travis-ci.org/mhfs/devise-async) [![Code Climate](https://img.shields.io/codeclimate/github/mhfs/devise-async.svg?style=flat-square)](https://codeclimate.com/github/mhfs/devise-async)
+[![Build Status](https://app.travis-ci.com/joe1chen/devise-async.svg?branch=master)](https://app.travis-ci.com/github/joe1chen/devise-async)
 
 Devise Async provides an easy way to configure Devise to send its emails asynchronously using ActiveJob.
 
diff --git a/devise-async.gemspec b/devise-async.gemspec
index bfd10ee..e8a551e 100644
--- a/devise-async.gemspec
+++ b/devise-async.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec',        '~> 3.6'
   gem.add_development_dependency 'rspec-rails',  '~> 3.6'
-  gem.add_development_dependency 'sqlite3',      '~> 1.3'
+  gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'pry'
 end