6 files changed, 3 insertions, 34 deletions
diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb
index d4556cd7..7f7790f5 100644
--- a/test/test_pkcs12.rb
+++ b/test/test_pkcs12.rb
@@ -3,8 +3,6 @@ require_relative "utils"
 
 module OpenSSL
   class TestPKCS12 < OpenSSL::TestCase
-    include OpenSSL::TestUtils
-
     def setup
       super
       ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb
index 12711144..3d0a5061 100644
--- a/test/test_pkcs7.rb
+++ b/test/test_pkcs7.rb
@@ -26,10 +26,6 @@ class OpenSSL::TestPKCS7 < OpenSSL::TestCase
     @ee2_cert = issue_cert(ee2, @rsa1024, 3, ee_exts, @ca_cert, @rsa2048)
   end
 
-  def issue_cert(*args)
-    OpenSSL::TestUtils.issue_cert(*args)
-  end
-
   def test_signed
     store = OpenSSL::X509::Store.new
     store.add_cert(@ca_cert)
diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb
index 0f317c38..47f2d88f 100644
--- a/test/test_x509cert.rb
+++ b/test/test_x509cert.rb
@@ -12,10 +12,6 @@ class OpenSSL::TestX509Certificate < OpenSSL::TestCase
     @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
   end
 
-  def issue_cert(*args)
-    OpenSSL::TestUtils.issue_cert(*args)
-  end
-
   def test_serial
     [1, 2**32, 2**100].each{|s|
       cert = issue_cert(@ca, @rsa2048, s, [], nil, nil)
diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb
index 9c1cdbbf..73b6aa64 100644
--- a/test/test_x509crl.rb
+++ b/test/test_x509crl.rb
@@ -13,14 +13,6 @@ class OpenSSL::TestX509CRL < OpenSSL::TestCase
     @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
   end
 
-  def issue_crl(*args)
-    OpenSSL::TestUtils.issue_crl(*args)
-  end
-
-  def issue_cert(*args)
-    OpenSSL::TestUtils.issue_cert(*args)
-  end
-
   def test_basic
     now = Time.at(Time.now.to_i)
 
diff --git a/test/test_x509store.rb b/test/test_x509store.rb
index db5e41a0..36bef797 100644
--- a/test/test_x509store.rb
+++ b/test/test_x509store.rb
@@ -24,14 +24,6 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
     ctx.verify
   end
 
-  def issue_cert(*args)
-    OpenSSL::TestUtils.issue_cert(*args)
-  end
-
-  def issue_crl(*args)
-    OpenSSL::TestUtils.issue_crl(*args)
-  end
-
   def test_verify
     # OpenSSL uses time(2) while Time.now uses clock_gettime(CLOCK_REALTIME),
     # and there may be difference.
diff --git a/test/utils.rb b/test/utils.rb
index 1b58f3b3..b33d18eb 100644
--- a/test/utils.rb
+++ b/test/utils.rb
@@ -196,6 +196,9 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
   end
 
   class OpenSSL::TestCase < Test::Unit::TestCase
+    include OpenSSL::TestUtils
+    extend OpenSSL::TestUtils
+
     def setup
       if ENV["OSSL_GC_STRESS"] == "1"
         GC.stress = true
@@ -236,14 +239,6 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
       @server = nil
     end
 
-    def issue_cert(*arg)
-      OpenSSL::TestUtils.issue_cert(*arg)
-    end
-
-    def issue_crl(*arg)
-      OpenSSL::TestUtils.issue_crl(*arg)
-    end
-
     def readwrite_loop(ctx, ssl)
       while line = ssl.gets
         ssl.write(line)