diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5f8b5b72..081b5c13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,26 +23,32 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - run: bundle update && bundle exec rake test
       - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=2.2.4"
+        name: "rake test:sinatra SINATRA=2.2.4"
         env:
           SINATRA: 2.2.4
       - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.0.6"
+        name: "rake test:sinatra SINATRA=3.0.6"
+        if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.0.6
       - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.1.0"
+        name: "rake test:sinatra SINATRA=3.1.0"
         if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.1.0
       - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=3.2.0"
+        name: "rake test:sinatra SINATRA=3.2.0"
         if: ${{ matrix.ruby != '2.5' }}
         env:
           SINATRA: 3.2.0
       - run: bundle update && bundle exec rake test:sinatra
-        name: "rake test:rails SINATRA=main"
+        name: "rake test:sinatra SINATRA=4.0.0"
         if: ${{ matrix.ruby != '2.5' }}
+        env:
+          SINATRA: 4.0.0
+      - run: bundle update && bundle exec rake test:sinatra
+        name: "rake test:sinatra SINATRA=main"
+        if: ${{ matrix.ruby != '2.5' && matrix.ruby != '2.6' && matrix.ruby != '2.7' }}
         env:
           SINATRA: main
   rails-5:
@@ -88,13 +94,13 @@ jobs:
         with:
           ruby-version: 3.0
       - run: bundle update && bundle exec rake test:rails
-        name: "rake test:rails RAILS=7.0.7"
+        name: "rake test:rails RAILS=7.0.8"
         env:
           RAILS: 7.0.8
       - run: bundle update && bundle exec rake test:rails
-        name: "rake test:rails RAILS=7.1.0"
+        name: "rake test:rails RAILS=7.1.3"
         env:
-          RAILS: 7.1.2
+          RAILS: 7.1.3
       - run: bundle update && bundle exec rake test:rails
         name: "rake test:rails RAILS=main"
         env:
diff --git a/Gemfile b/Gemfile
index 93300652..f88590a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,6 @@ if ENV['SINATRA']
   if ENV['SINATRA'] == 'main'
     gem 'sinatra', github: 'sinatra/sinatra'
   else
-    gem 'sinatra', tag: "v#{ENV['SINATRA']}"
+    gem 'sinatra', "= #{ENV['SINATRA']}"
   end
 end