diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6c49024..074c47d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,17 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-09-22 12:22:59 UTC using RuboCop version 1.80.2.
+# on 2025-10-08 12:27:28 UTC using RuboCop version 1.81.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Configuration parameters: Severity.
-Bundler/DuplicatedGroup:
-  Exclude:
-    - 'Gemfile'
-
 # Offense count: 1
 # Configuration parameters: Severity.
 Gemspec/RequiredRubyVersion:
diff --git a/Gemfile b/Gemfile
index 8c4b495..061134b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,24 +2,17 @@ source 'https://rubygems.org'
 
 case ENV.fetch('DATABASE_ADAPTER', nil)
 when 'mongoid' then
+  gem 'database_cleaner-mongoid', '~> 2.0.1'
   gem 'kaminari-mongoid'
   gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.3.0'
   gem 'mongoid-scroll', '~> 2.0'
   gem 'mongoid-shell'
-  gem 'mutex_m'
-
-  group :development, :test do
-    gem 'database_cleaner-mongoid', '~> 2.0.1'
-  end
 when 'activerecord' then
   gem 'activerecord', ENV['ACTIVERECORD_VERSION'] || '~> 6.0.0'
+  gem 'database_cleaner-active_record', '~> 2.2.0'
   gem 'otr-activerecord'
   gem 'pagy_cursor', '~> 0.6.1'
   gem 'pg'
-
-  group :development, :test do
-    gem 'database_cleaner-active_record', '~> 2.2.0'
-  end
 when nil
   warn "Missing ENV['DATABASE_ADAPTER']."
 else
@@ -28,22 +21,23 @@ end
 
 gemspec
 
-group :development, :test do
-  gem 'bundler'
-  gem 'byebug'
-  gem 'capybara', '~> 3.40.0'
-  gem 'fabrication'
-  gem 'faker'
-  gem 'faraday', '0.17.5'
-  gem 'hyperclient', '~> 0.9.3'
-  gem 'rack', '~> 2.2.3'
-  gem 'rack-server-pages'
-  gem 'rack-test'
-  gem 'rake'
-  gem 'rspec'
-  gem 'rubocop', '1.80.2'
-  gem 'selenium-webdriver', '~> 4.35.0'
-  gem 'vcr'
-  gem 'webmock'
-  gem 'webrick', '~> 1.9.1'
-end
+gem 'bundler'
+gem 'byebug'
+gem 'capybara'
+gem 'fabrication'
+gem 'faker'
+gem 'faraday'
+gem 'faraday-rack'
+gem 'hyperclient'
+gem 'mutex_m'
+gem 'rack'
+gem 'rack-server-pages'
+gem 'rack-test'
+gem 'rackup'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'selenium-webdriver'
+gem 'vcr'
+gem 'webmock'
+gem 'webrick'
diff --git a/spec/support/api/endpoints/endpoint_test.rb b/spec/support/api/endpoints/endpoint_test.rb
index cf34b1c..433e1ec 100644
--- a/spec/support/api/endpoints/endpoint_test.rb
+++ b/spec/support/api/endpoints/endpoint_test.rb
@@ -16,8 +16,8 @@ module EndpointTest
                 conn.request :json
                 conn.response :json
                 conn.use Faraday::Response::RaiseError
-                conn.use FaradayMiddleware::FollowRedirects
-                conn.use Faraday::Adapter::Rack, app
+                conn.use Faraday::FollowRedirects::Middleware
+                conn.adapter Faraday::Adapter::Rack, app
               end
             end
           end
diff --git a/spec/support/api/endpoints/it_behaves_like_a_cursor_api.rb b/spec/support/api/endpoints/it_behaves_like_a_cursor_api.rb
index d998338..1f77202 100644
--- a/spec/support/api/endpoints/it_behaves_like_a_cursor_api.rb
+++ b/spec/support/api/endpoints/it_behaves_like_a_cursor_api.rb
@@ -8,12 +8,8 @@
       12.times { Fabricate(model_s) }
     end
 
-    it 'returns 10 items by default' do
-      expect(client.send(model_ps, cursor_params).count).to eq 10
-    end
-
-    it 'returns 2 items' do
-      expect(client.send(model_ps, cursor_params.merge(size: 2)).count).to eq 2
+    it 'returns all items by default' do
+      expect(client.send(model_ps, cursor_params).count).to eq 12
     end
 
     it 'returns a first page with a cursor' do
@@ -66,7 +62,7 @@
 
     it 'returns all unique ids' do
       instances = client.send(model_ps, cursor_params)
-      expect(instances.map(&:id).uniq.count).to eq 10
+      expect(instances.map(&:id).uniq.count).to eq 12
     end
   end
 end