diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b1383d6..ab6dc19 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,18 +7,19 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.7'
-          - '3.0'
           - '3.1'
+          - '3.2'
+          - '3.3'
         gemfile:
-          - gemfiles/Gemfile.rails60
-          - gemfiles/Gemfile.rails61
           - gemfiles/Gemfile.rails70
+          - gemfiles/Gemfile.rails71
+          - gemfiles/Gemfile.rails72
+          - gemfiles/Gemfile.rails80
         exclude:
-          # rails 7.0 requires ruby >= 2.7
+          # rails 8.0 requires ruby >= 3.2
           # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-          - ruby-version: '2.6'
-            gemfile: 'gemfiles/Gemfile.rails70'
+          - ruby-version: '3.1'
+            gemfile: 'gemfiles/Gemfile.rails80'
 
     name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78236bb..7cc699d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased]
-* No unreleased changes
+### Fixed
+* Support Ruby 3.2, 3.3, Rails 7.1, 7.2 and 8.0. Drop support for Ruby 3.0, Rails 6.1
 
 ## 1.1.1 / 2022-12-08
 ### Fixed
diff --git a/gemfiles/Gemfile.rails60 b/gemfiles/Gemfile.rails71
similarity index 68%
rename from gemfiles/Gemfile.rails60
rename to gemfiles/Gemfile.rails71
index 16a3589..173bb3f 100644
--- a/gemfiles/Gemfile.rails60
+++ b/gemfiles/Gemfile.rails71
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0'
+gem 'rails', '~> 7.1.0'
diff --git a/gemfiles/Gemfile.rails61 b/gemfiles/Gemfile.rails72
similarity index 67%
rename from gemfiles/Gemfile.rails61
rename to gemfiles/Gemfile.rails72
index e17af7b..778829b 100644
--- a/gemfiles/Gemfile.rails61
+++ b/gemfiles/Gemfile.rails72
@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.1.0'
-
+gem 'rails', '~> 7.2.0'
diff --git a/gemfiles/Gemfile.rails80 b/gemfiles/Gemfile.rails80
new file mode 100644
index 0000000..4377f7d
--- /dev/null
+++ b/gemfiles/Gemfile.rails80
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'rails', '~> 8.0.0'
diff --git a/lib/tnql.rb b/lib/tnql.rb
index 89acaa4..fc54c4b 100644
--- a/lib/tnql.rb
+++ b/lib/tnql.rb
@@ -1,3 +1,9 @@
+require 'active_support/deprecation'
+begin
+  require 'active_support/deprecator'
+rescue LoadError
+  # Ignore error: 'active_support/deprecator' is not defined on active_support 7.0
+end
 require 'active_support/time'
 
 require 'tnql/version'
diff --git a/tnql.gemspec b/tnql.gemspec
index 362f208..80a41f8 100644
--- a/tnql.gemspec
+++ b/tnql.gemspec
@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'activesupport', '>= 3.2.18', '< 7.1'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.1'
   spec.add_dependency 'chronic', '~> 0.3'
   spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
   spec.add_dependency 'treetop', '>= 1.4.10'