diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 74c380a..434df2f 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,27 +13,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        active_record:
-          - '6.0'
-          - '6.1'
-          - '7.0'
-          - '7.1'
-        ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
         include:
-          - active_record: '5.1'
-            ruby: '2.7'
-          - active_record: '5.2'
-            ruby: '2.7'
-          - active_record: '7.1'
-            ruby: '3.3'
+          - { active_record: '5.1', ruby: '2.7' }
+          - { active_record: '5.2', ruby: '2.7' }
+          - { active_record: '6.0', ruby: '2.7' }
+          - { active_record: '6.0', ruby: '3.0' }
+          - { active_record: '6.0', ruby: '3.1' }
+          - { active_record: '6.0', ruby: '3.2' }
+          - { active_record: '6.1', ruby: '2.7' }
+          - { active_record: '6.1', ruby: '3.0' }
+          - { active_record: '6.1', ruby: '3.1' }
+          - { active_record: '6.1', ruby: '3.2' }
+          - { active_record: '7.0', ruby: '2.7' }
+          - { active_record: '7.0', ruby: '3.0' }
+          - { active_record: '7.0', ruby: '3.1' }
+          - { active_record: '7.0', ruby: '3.2' }
+          - { active_record: '7.1', ruby: '2.7' }
+          - { active_record: '7.1', ruby: '3.0' }
+          - { active_record: '7.1', ruby: '3.1' }
+          - { active_record: '7.1', ruby: '3.2' }
+          - { active_record: '7.1', ruby: '3.3' }
+          - { active_record: '7.2', ruby: '3.1' }
+          - { active_record: '7.2', ruby: '3.2' }
+          - { active_record: '7.2', ruby: '3.3' }
+          - { active_record: '7.2', ruby: '3.4' }
+          - { active_record: '8.0', ruby: '3.2' }
+          - { active_record: '8.0', ruby: '3.3' }
+          - { active_record: '8.0', ruby: '3.4' }
     env:
       ACTIVERECORD: ${{ matrix.active_record }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
diff --git a/Gemfile b/Gemfile
index fa75df1..3118e7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "concurrent-ruby", "< 1.3.5"
diff --git a/attr_encrypted.gemspec b/attr_encrypted.gemspec
index a556d41..8dd52ec 100644
--- a/attr_encrypted.gemspec
+++ b/attr_encrypted.gemspec
@@ -42,9 +42,12 @@ Gem::Specification.new do |s|
     s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
     s.add_development_dependency('jdbc-sqlite3', '< 3.8.7') # 3.8.7 is nice and broke
   else
-    s.add_development_dependency('sqlite3', '= 1.5.4')
+    if ENV['ACTIVERECORD'] && Gem::Version.new(ENV['ACTIVERECORD']) >= Gem::Version.new('8.0')
+      s.add_development_dependency('sqlite3', '> 2.1.0')
+    else
+      s.add_development_dependency('sqlite3', '= 1.5.4')
+    end
   end
-  s.add_development_dependency('dm-sqlite-adapter')
   s.add_development_dependency('pry')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('simplecov-rcov')