2 files changed, 11 insertions, 3 deletions
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb
index c4eaddbd97..5711aa1abf 100644
--- a/lib/rdoc/rubygems_hook.rb
+++ b/lib/rdoc/rubygems_hook.rb
@@ -3,6 +3,11 @@ require 'rubygems/user_interaction'
 require 'fileutils'
 require 'rdoc'
 
+begin
+  require 'json'
+rescue LoadError
+end
+
 ##
 # Gem::RDoc provides methods to generate RDoc and ri data for installed gems
 # upon gem installation.
@@ -200,7 +205,7 @@ class RDoc::RubygemsHook
       @generate_ri   and (@force or not File.exist? @ri_dir)
 
     document 'darkfish', options, @rdoc_dir if
-      @generate_rdoc and (@force or not File.exist? @rdoc_dir)
+      defined?(JSON) and @generate_rdoc and (@force or not File.exist? @rdoc_dir)
   end
 
   ##
@@ -250,4 +255,3 @@ class RDoc::RubygemsHook
   end
 
 end
-
diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb
index 4989516b7a..3b2c181201 100644
--- a/lib/rdoc/test_case.rb
+++ b/lib/rdoc/test_case.rb
@@ -6,6 +6,11 @@ rescue NoMethodError, Gem::LoadError
   # for ruby tests
 end
 
+begin
+  require 'json'
+rescue LoadError
+end
+
 require 'minitest/autorun'
 require 'minitest/benchmark' if ENV['BENCHMARK']
 
@@ -214,4 +219,3 @@ $LOAD_PATH.each do |load_path|
   break if load_path[0] == ?/
   load_path.replace File.expand_path load_path
 end if RUBY_VERSION < '1.9'
-