2 files changed, 8 insertions, 2 deletions
diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index 11b2216b20..0111e11337 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -5,7 +5,13 @@ require 'date'
 require 'psych'
 
 module Psych
-  class TestCase < MiniTest::Unit::TestCase
+  superclass = if defined?(Minitest::Test)
+                 Minitest::Test
+               else
+                 MiniTest::Unit::TestCase
+               end
+
+  class TestCase < superclass
     def self.suppress_warning
       verbose, $VERBOSE = $VERBOSE, nil
       yield
diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb
index 5b4860c435..724aab4f0e 100644
--- a/test/psych/test_to_yaml_properties.rb
+++ b/test/psych/test_to_yaml_properties.rb
@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 module Psych
-  class TestToYamlProperties < MiniTest::Unit::TestCase
+  class TestToYamlProperties < Psych::TestCase
     class Foo
       attr_accessor :a, :b, :c
       def initialize