diff --git a/Gemfile b/Gemfile
index d5c42a0b1f0..57f16711f99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,8 +33,6 @@ end
 # If Psych doesn't build, you can disable this group locally by running
 # `bundle config set --local without rdoc`
 # Then re-run `bundle install`.
-unless RUBY_PLATFORM == "java" # see #3391 and https://github.com/jruby/jruby/issues/7262
-  group :rdoc do
-    gem "rdoc", "6.10.0"
-  end
+group :rdoc do
+  gem "rdoc", "6.10.0" unless RUBY_PLATFORM == "java" || ENV["CI"]
 end
diff --git a/scripts/test-gem-install b/scripts/test-gem-install
index 8528dc0475a..6d3394d2f62 100755
--- a/scripts/test-gem-install
+++ b/scripts/test-gem-install
@@ -28,6 +28,7 @@ popd
 # 2.3.21 because https://github.com/rubygems/rubygems/issues/5914
 # 2.3.22 because https://github.com/rubygems/rubygems/issues/5940
 gem install bundler -v "~> 2.2, != 2.3.21, != 2.3.22"
+bundle config set --local without rdoc
 bundle install --local || bundle install
 
 rm -rf lib ext # ensure we don't use the local files