diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0a9ab03f49755f1d629c2c0d59199d3751b76ba..dbfc76d52806783a9a510324cec70240c21416a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,3 +77,8 @@ rails_52_ruby_25:
   <<: *ruby_25
   script:
     - bundle exec appraisal rails52 bundle exec rspec
+
+rails_60_ruby_25:
+  <<: *ruby_25
+  script:
+    - bundle exec appraisal rails60 bundle exec rspec
diff --git a/Appraisals b/Appraisals
index b6382fa7ff0d1f6085042eeb2fabfc2cc0c1d0c7..60b3e638b5ee7eb09e9b95d1d28a59eafc87da1f 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,15 +1,26 @@
 appraise "rails42" do
   gem "activesupport", "~> 4.2.10"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails50" do
   gem "activesupport", "~> 5.0.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails51" do
   gem "activesupport", "~> 5.1.0"
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise "rails52" do
   gem "activesupport", "~> 5.2.0"
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+if RUBY_VERSION.to_f >= 2.5
+  appraise "rails60" do
+    gem "activesupport", "~> 6.0.0"
+    gem 'sqlite3', '~> 1.4'
+  end
 end
diff --git a/Gemfile b/Gemfile
index b6a6ae7f184f64c4869d2e81f4c950de56a1c5f3..e24c6a9b39ac923783f5a97b4566942b155a5ea5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :test do
   gem 'active_interaction', '~> 3.0'
   gem 'appsignal', '~> 2.9.8'
   gem 'climate_control' # For ENV modification in specs
-  gem 'combustion', '~> 0.5.2'
+  gem 'combustion', '~> 1.1.1'
   gem 'fakefs', require: 'fakefs/safe'
   gem 'guard-rspec', '~> 4.2.6'
   gem 'responders'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4f16bb0458b142b1211b6b0e5dec6b15c2525a26..ae1cd0b5f21e1e4c52f157046ddb5ae5b2c4b3ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,7 +10,7 @@ PATH
   specs:
     roqua-support (0.3.2)
       active_interaction (~> 3.0)
-      activesupport (>= 3.2, < 6)
+      activesupport (>= 3.2, < 6.1)
       appsignal (~> 2.9.8)
       naught (~> 1.0)
       with_advisory_lock (~> 3.2)
@@ -55,7 +55,7 @@ GEM
     builder (3.2.3)
     climate_control (0.2.0)
     coderay (1.1.1)
-    combustion (0.5.5)
+    combustion (1.1.1)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
@@ -165,7 +165,6 @@ GEM
     ruby_dep (1.5.0)
     shellany (0.0.1)
     slop (3.6.0)
-    sqlite3 (1.3.13)
     thor (0.19.4)
     thread_safe (0.3.5)
     timecop (0.9.1)
@@ -182,10 +181,10 @@ DEPENDENCIES
   actionpack (>= 4.0)
   active_interaction (~> 3.0)
   appraisal
-  appsignal (~> 2.9.6)
+  appsignal (~> 2.9.8)
   bundler (~> 1.0)
   climate_control
-  combustion (~> 0.5.2)
+  combustion (~> 1.1.1)
   delayed_job_active_record
   fakefs
   guard-rspec (~> 4.2.6)
@@ -197,7 +196,6 @@ DEPENDENCIES
   rspec (>= 2.12.0, < 4.0)
   rspec-instrumentation-matcher
   rspec-rails
-  sqlite3 (~> 1.3.6)
   timecop
 
 BUNDLED WITH
diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
index 45d357b36cd5057e5dd936cb55b95bc91ef74e87..abcbfd9402dab90f27737b1b55757a7909cc4779 100644
--- a/gemfiles/rails42.gemfile
+++ b/gemfiles/rails42.gemfile
@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 4.2.10"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile
index ab469855a096417c1fb3365f9cd29d5f163b22d5..0931494dcb250eed705cff4460e19ed5ca94d623 100644
--- a/gemfiles/rails50.gemfile
+++ b/gemfiles/rails50.gemfile
@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile
index 585d87f73455534c25ff7a6de174f9cf33d5d0e8..48b8e8046cf7b2c9940a6e2ec992bd4ca67026fa 100644
--- a/gemfiles/rails51.gemfile
+++ b/gemfiles/rails51.gemfile
@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile
index 64c8fa7ce12096aad2e70d5f3834d6375bead912..6f73eabae268082c2b10895262ff61399f6f813b 100644
--- a/gemfiles/rails52.gemfile
+++ b/gemfiles/rails52.gemfile
@@ -5,18 +5,20 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
 gem "activesupport", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.6"
 
 group :test do
   gem "actionpack", ">= 4.0"
   gem "active_interaction", "~> 3.0"
-  gem "appsignal"
+  gem "appsignal", "~> 2.9.8"
   gem "climate_control"
-  gem "combustion", "~> 0.5.2"
+  gem "combustion", "~> 1.1.1"
   gem "fakefs", :require => "fakefs/safe"
   gem "guard-rspec", "~> 4.2.6"
   gem "responders"
   gem "rspec-instrumentation-matcher"
   gem "rspec-rails"
+  gem "pry"
 end
 
 gemspec :path => "../"
diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile
new file mode 100644
index 0000000000000000000000000000000000000000..5b29f1773c29627c2fc42ece6631c04c74a9d272
--- /dev/null
+++ b/gemfiles/rails60.gemfile
@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "roqua_styleguide", :git => "https://gitlab.roqua.nl/roqua/styleguide.git"
+gem "activesupport", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+
+group :test do
+  gem "actionpack", ">= 4.0"
+  gem "active_interaction", "~> 3.0"
+  gem "appsignal", "~> 2.9.8"
+  gem "climate_control"
+  gem "combustion", "~> 1.1.1"
+  gem "fakefs", :require => "fakefs/safe"
+  gem "guard-rspec", "~> 4.2.6"
+  gem "responders"
+  gem "rspec-instrumentation-matcher"
+  gem "rspec-rails"
+  gem "pry"
+end
+
+gemspec :path => "../"
diff --git a/roqua-support.gemspec b/roqua-support.gemspec
index 3c7485684cfe82ed2886367d3f6b0b604c65bde1..7490bf22fbca63c702f9ae82f1f990884967b075 100644
--- a/roqua-support.gemspec
+++ b/roqua-support.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'active_interaction', '~> 3.0'
-  gem.add_dependency 'activesupport', '>= 3.2', '< 6'
+  gem.add_dependency 'activesupport', '>= 3.2', '< 6.1'
   gem.add_dependency 'naught', '~> 1.0'
   gem.add_dependency 'with_advisory_lock', '~> 3.2'
   gem.add_dependency 'appsignal', '~> 2.9.8'
@@ -28,6 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'delayed_job_active_record'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.12.0', '< 4.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
   gem.add_development_dependency 'timecop'
 end