diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
index 72e6e90193..d6e8dc4672 100644
--- a/lib/rdoc/servlet.rb
+++ b/lib/rdoc/servlet.rb
@@ -145,7 +145,7 @@ def do_GET req, res
   # +generator+ is used to create the page.
 
   def documentation_page store, generator, path, req, res
-    text_name = path.sub /.html$/, ''
+    text_name = path.chomp '.html'
     name = text_name.gsub '/', '::'
 
     if klass = store.find_class_or_module(name) then
diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb
index ff0c29ae1b..a85bd291d6 100644
--- a/test/rdoc/test_rdoc_rubygems_hook.rb
+++ b/test/rdoc/test_rdoc_rubygems_hook.rb
@@ -131,8 +131,9 @@ def test_generate_configuration_rdoc_string
   end
 
   def test_generate_default_gem
-    @a.loaded_from =
-      File.join Gem::Specification.default_specifications_dir, 'a.gemspec'
+    klass =
+      (Gem.respond_to?(:default_specifications_dir) ? Gem : Gem::Specification)
+    @a.loaded_from = File.join klass.default_specifications_dir, 'a.gemspec'
 
     @hook.generate
 
diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb
index b26ce28c3a..e91c57897a 100644
--- a/test/rdoc/test_rdoc_servlet.rb
+++ b/test/rdoc/test_rdoc_servlet.rb
@@ -237,7 +237,7 @@ def test_documentation_page_page_with_nesting
 
     generator = @s.generator_for store
 
-    readme = store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple
+    store.add_file 'nesting/README.rdoc', parser: RDoc::Parser::Simple
 
     @s.documentation_page store, generator, 'nesting/README_rdoc.html', @req, @res