4 files changed, 26 insertions, 31 deletions
diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb
index f30ee8ad2a..42475ed2d8 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/test_files.rb
@@ -1,8 +1,10 @@
 begin
-
-require 'ripper'
-require 'find'
-require 'test/unit'
+  require 'ripper'
+  require 'find'
+  require 'test/unit'
+  ripper_test = true
+rescue LoadError
+end
 
 class TestRipper_Generic < Test::Unit::TestCase
   SRCDIR = File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))
@@ -21,8 +23,4 @@ class TestRipper_Generic < Test::Unit::TestCase
       assert_nothing_raised("ripper failed to parse: #{n.inspect}") { Parser.new(File.read(n)).parse }
     }
   end
-end
-
-rescue LoadError
-end
-
+end if ripper_test
diff --git a/test/ripper/test_filter.rb b/test/ripper/test_filter.rb
index 4e9ee88dd8..d7e9ba0dcc 100644
--- a/test/ripper/test_filter.rb
+++ b/test/ripper/test_filter.rb
@@ -1,7 +1,9 @@
 begin
-
-require 'ripper'
-require 'test/unit'
+  require 'ripper'
+  require 'test/unit'
+  ripper_test = true
+rescue LoadError
+end
 
 class TestRipper_Filter < Test::Unit::TestCase
 
@@ -48,7 +50,4 @@ class TestRipper_Filter < Test::Unit::TestCase
     Filter.new(File.read(filename)).parse(data)
     assert_equal("begin", data[:token])
   end
-end
-
-rescue LoadError
-end
+end if ripper_test
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index 6ca81d3f09..6b37ff4da9 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -1,8 +1,10 @@
 begin
-
-require_relative 'dummyparser'
-require_relative '../ruby/envutil'
-require 'test/unit'
+  require_relative 'dummyparser'
+  require_relative '../ruby/envutil'
+  require 'test/unit'
+  ripper_test = true
+rescue LoadError
+end
 
 class TestRipper_ParserEvents < Test::Unit::TestCase
 
@@ -624,7 +626,4 @@ class TestRipper_ParserEvents < Test::Unit::TestCase
                         ["[fcall(proc,[],&block([],[void()]))]"], [], '[ruby-dev:39423]')
     end
   end
-end
-
-rescue LoadError
-end
+end if ripper_test
diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb
index 423fe8f776..d6997ff475 100644
--- a/test/ripper/test_scanner_events.rb
+++ b/test/ripper/test_scanner_events.rb
@@ -2,9 +2,11 @@
 # test_scanner_events.rb
 #
 begin
-
-require 'ripper'
-require 'test/unit'
+  require 'ripper'
+  require 'test/unit'
+  ripper_test = true
+rescue LoadError
+end
 
 class TestRipper_ScannerEvents < Test::Unit::TestCase
 
@@ -806,7 +808,4 @@ class TestRipper_ScannerEvents < Test::Unit::TestCase
   def test_tlambda_arg
   end
 
-end
-
-rescue LoadError
-end
+end if ripper_test