5 files changed, 11 insertions, 6 deletions
diff --git a/cpan/Module-Load/t/01_Module-Load.t b/cpan/Module-Load/t/01_Module-Load.t
index 228b31d7bd..42867f680c 100644
--- a/cpan/Module-Load/t/01_Module-Load.t
+++ b/cpan/Module-Load/t/01_Module-Load.t
@@ -1,4 +1,7 @@
 ### Module::Load test suite ###
+use strict;
+use warnings;
+
 BEGIN {
     if( $ENV{PERL_CORE} ) {
         chdir '../lib/Module/Load' if -d '../lib/Module/Load';
@@ -8,7 +11,6 @@ BEGIN {
 
 BEGIN { chdir 't' if -d 't' }
 
-use strict;
 use lib qw[../lib to_load];
 use Module::Load;
 use Test::More 'no_plan';
diff --git a/cpan/Module-Load/t/02_Module-Load.t b/cpan/Module-Load/t/02_Module-Load.t
index 2565f262f8..f2c0eac6db 100644
--- a/cpan/Module-Load/t/02_Module-Load.t
+++ b/cpan/Module-Load/t/02_Module-Load.t
@@ -1,8 +1,9 @@
 #!perl
 
-use Test::More;
 use strict;
 use warnings;
+
+use Test::More;
 use Config;
 
 #
diff --git a/cpan/Module-Load/t/to_load/LoadIt.pm b/cpan/Module-Load/t/to_load/LoadIt.pm
index 63874fd443..317745cb9c 100644
--- a/cpan/Module-Load/t/to_load/LoadIt.pm
+++ b/cpan/Module-Load/t/to_load/LoadIt.pm
@@ -1,3 +1,3 @@
-$VERSION = 1;
+our $VERSION = 1;
 
-1;
-\ No newline at end of file
+1;
diff --git a/cpan/Module-Load/t/to_load/Must/Be/Loaded.pm b/cpan/Module-Load/t/to_load/Must/Be/Loaded.pm
index 46de6d5e14..b98728c57d 100644
--- a/cpan/Module-Load/t/to_load/Must/Be/Loaded.pm
+++ b/cpan/Module-Load/t/to_load/Must/Be/Loaded.pm
@@ -1,3 +1,3 @@
-$VERSION = 0.01;
+our $VERSION = 0.01;
 
-1;
-\ No newline at end of file
+1;
diff --git a/cpan/Module-Load/t/to_load/TestModule.pm b/cpan/Module-Load/t/to_load/TestModule.pm
index ffc5ec98f5..e344b43bb2 100644
--- a/cpan/Module-Load/t/to_load/TestModule.pm
+++ b/cpan/Module-Load/t/to_load/TestModule.pm
@@ -1,6 +1,8 @@
 package TestModule;
 
 use strict;
+use warnings;
+
 require Exporter;
 use vars qw(@EXPORT @EXPORT_OK @ISA $IMPORTED);