diff --git a/ChangeLog b/ChangeLog
index ceaa9f31ef..5c11fd3eea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jun 12 13:47:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* test/openssl/test_engine.rb (test_openssl_engine_builtin,
+	  test_openssl_engine_by_id_string): Skip test if 'openssl' engine is
+	  already loaded. And test the number increased by Engine.load{_by_id,},
+	  not the total count of loaded engines. Previously, we called
+	  OpenSSL::Engine.cleanup every time running a test case, but we no
+	  longer can do it.
+	  [ruby-core:75225] [Feature #12324]
+
 Sun Jun 12 09:24:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (append_fspath): normalize directory name to be appended
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
index 77f6e1a967..bbf56a1887 100644
--- a/test/openssl/test_engine.rb
+++ b/test/openssl/test_engine.rb
@@ -13,17 +13,21 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
 
   def test_openssl_engine_builtin
     with_openssl <<-'end;'
+      orig = OpenSSL::Engine.engines
+      skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
       engine = OpenSSL::Engine.load("openssl")
       assert_equal(true, engine)
-      assert_equal(1, OpenSSL::Engine.engines.size)
+      assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
     end;
   end
 
   def test_openssl_engine_by_id_string
     with_openssl <<-'end;'
+      orig = OpenSSL::Engine.engines
+      skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
       engine = get_engine
       assert_not_nil(engine)
-      assert_equal(1, OpenSSL::Engine.engines.size)
+      assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
     end;
   end