diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d7bc202..aa675270 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
 
 #### Fixes
 
-* your contribution
+* Your contribution here.
+* [#954](https://github.com/ruby-grape/grape-swagger/pull/954): Ruby 3.5 compatibility: add cgi gem, drop runtime rack‑test - [@numbata](https://github.com/numbata).
 * [#948](https://github.com/ruby-grape/grape-swagger/pull/948): Grape 2.3.0 and Ruby 3.5 compatibility - [@numbata](https://github.com/numbata)
 
 
diff --git a/Gemfile b/Gemfile
index ebfe7cf5..5a111630 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ group :development, :test do
     gem 'rack', '< 3.0'
   end
 
+  gem 'cgi'
   gem 'rack-cors'
   gem 'rack-test'
   gem 'rake'
diff --git a/grape-swagger.gemspec b/grape-swagger.gemspec
index c8007a0c..2ced24ac 100644
--- a/grape-swagger.gemspec
+++ b/grape-swagger.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.1'
   s.add_dependency 'grape', '>= 1.7', '< 3.0'
-  s.add_dependency 'rack-test', '~> 2'
 
   s.files = Dir['lib/**/*', '*.md', 'LICENSE.txt', 'grape-swagger.gemspec']
   s.require_paths = ['lib']