diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cde0169..c51a8ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,12 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2', '3.3', '3.4']
-        rails: ['7.1.0', '7.2.0', '8.0.0']
+        ruby: ['3.3', '3.4', '4.0']
+        rails: ['8.0.0', '8.1.0']
         activeadmin: ['3.2.0', '3.3.0', '3.4.0', '3.5.1']
-        exclude:
-          - rails: '8.0.0'
-            activeadmin: '3.2.0'
     env:
       RAILS: ${{ matrix.rails }}
       AA: ${{ matrix.activeadmin }}
@@ -35,7 +32,7 @@ jobs:
         run: bundle exec rspec spec
 
       - name: Generate badge.json
-        if: matrix.ruby == '3.4' && matrix.rails == '8.0.0' && matrix.activeadmin == '3.5.1'
+        if: matrix.ruby == '4.0' && matrix.rails == '8.1.0' && matrix.activeadmin == '3.5.1'
         run: |
           LAST_RUN="coverage/.last_run.json"
           if [ ! -f "$LAST_RUN" ]; then
@@ -53,7 +50,7 @@ jobs:
           echo "{\"schemaVersion\":1,\"label\":\"coverage\",\"message\":\"${PERCENT}%\",\"color\":\"${COLOR}\"}" > badge/badge.json
 
       - name: Upload badge artifact
-        if: matrix.ruby == '3.4' && matrix.rails == '8.0.0' && matrix.activeadmin == '3.5.1'
+        if: matrix.ruby == '4.0' && matrix.rails == '8.1.0' && matrix.activeadmin == '3.5.1'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-badge
diff --git a/Gemfile b/Gemfile
index 165e561..c1b79dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-default_rails_version = '7.1.0'
+default_rails_version = '8.0.0'
 default_activeadmin_version = '3.2.0'
 
 gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
diff --git a/active_admin_datetimepicker.gemspec b/active_admin_datetimepicker.gemspec
index 843e25f..5889802 100644
--- a/active_admin_datetimepicker.gemspec
+++ b/active_admin_datetimepicker.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/activeadmin-plugins/activeadmin_datetimepicker"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = '>= 3.1.0'
+  spec.required_ruby_version = '>= 3.3'
 
   # Whitelist, not a reject list: a new directory in the repo does not
   # reach consumers until it is named here. The reject form needs a new
diff --git a/tasks/test.rake b/tasks/test.rake
index f46bf45..3eacb6a 100644
--- a/tasks/test.rake
+++ b/tasks/test.rake
@@ -6,6 +6,7 @@ task :setup do
     --skip-turbolinks
     --skip-spring
     --skip-bootsnap
+    --skip-javascript
     -m
     spec/support/rails_template.rb
   )