2 files changed, 5 insertions, 4 deletions
diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 207e801607..8b9ddbe03c 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -3,12 +3,15 @@ package OpenSSL::Test;
 use strict;
 use warnings;
 
+use Test::More 0.96;
+
 use Exporter;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 $VERSION = "0.5";
 @ISA = qw(Exporter);
-@EXPORT = qw(setup indir app test run);
-@EXPORT_OK = qw(top_dir top_file pipe with cmdstr quotify));
+@EXPORT = (@Test::More::EXPORT, qw(setup indir app test run));
+@EXPORT_OK = (@Test::More::EXPORT_OK, qw(top_dir top_file pipe with cmdstr
+                                         quotify));
 
 
 use File::Copy;
@@ -16,7 +19,6 @@ use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
                              catdir catfile splitpath catpath devnull abs2rel
                              rel2abs/;
 use File::Path 2.00 qw/remove_tree mkpath/;
-use Test::More 0.96;
 
 
 my $test_name = undef;
diff --git a/test/testlib/OpenSSL/Test/Simple.pm b/test/testlib/OpenSSL/Test/Simple.pm
index be86ca2cb2..145778eb27 100644
--- a/test/testlib/OpenSSL/Test/Simple.pm
+++ b/test/testlib/OpenSSL/Test/Simple.pm
@@ -10,7 +10,6 @@ $VERSION = "0.1";
 @EXPORT = qw(simple_test);
 
 
-use Test::More 0.96;
 use OpenSSL::Test;
 
 # args: