diff --git a/ChangeLog b/ChangeLog
index 9ce655e827..eaaabb4f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 22 14:47:53 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* test/openssl/test_buffering.rb
+	* test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
+	  instead of Mintest::Unit::TestCase. [ruby-core:37275]
+	  
 Wed Jun 22 12:41:03 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
 
 	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb
index 25e0b66232..1e2197533a 100644
--- a/test/openssl/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
@@ -1,8 +1,7 @@
 require_relative 'utils'
 require 'stringio'
-require 'minitest/unit'
 
-class OpenSSL::TestBuffering < MiniTest::Unit::TestCase
+class OpenSSL::TestBuffering < Test::Unit::TestCase
 
   class IO
     include OpenSSL::Buffering
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index 223497d9f1..8b8acfef09 100644
--- a/test/openssl/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
@@ -3,7 +3,7 @@ require_relative "utils"
 if defined?(OpenSSL)
 
 module OpenSSL
-  class TestPKCS12 < MiniTest::Unit::TestCase
+  class TestPKCS12 < Test::Unit::TestCase
     include OpenSSL::TestUtils
 
     def setup