diff -up Module-Implementation-0.05/t/basic.t.orig Module-Implementation-0.05/t/basic.t
--- Module-Implementation-0.05/t/basic.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/basic.t	2012-02-10 10:53:07.453271294 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 5;
 
 {
     package T;
@@ -33,5 +33,3 @@ use Test::More 0.88;
         'T::_implementation returns default implementation'
     );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/both-fail.t.orig Module-Implementation-0.05/t/both-fail.t
--- Module-Implementation-0.05/t/both-fail.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/both-fail.t	2012-02-10 10:53:07.461271306 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 1;
 use Test::Fatal;
 
 {
@@ -24,5 +24,3 @@ use Test::Fatal;
         'Got an exception when all implementations fail to load'
     );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/env-value.t.orig Module-Implementation-0.05/t/env-value.t
--- Module-Implementation-0.05/t/env-value.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/env-value.t	2012-02-10 10:53:07.462271308 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 4;
 
 {
     package T;
@@ -35,5 +35,3 @@ use Test::More 0.88;
         'T::_implementation returns implementation set in ENV'
     );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/more-symbols.t.orig Module-Implementation-0.05/t/more-symbols.t
--- Module-Implementation-0.05/t/more-symbols.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/more-symbols.t	2012-02-10 10:53:07.462271308 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 7;
 
 {
     package T;
@@ -43,5 +43,3 @@ use Test::More 0.88;
         '%T::HASH was copied from implementation'
     );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/one-impl-fails1.t.orig Module-Implementation-0.05/t/one-impl-fails1.t
--- Module-Implementation-0.05/t/one-impl-fails1.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/one-impl-fails1.t	2012-02-10 10:53:07.462271308 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 2;
 
 {
     package T;
@@ -24,5 +24,3 @@ use Test::More 0.88;
     ok( T->can('return_42'),       'T package has a return_42 sub' );
     ok( !T->can('return_package'), 'T package has a return_package sub' );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/one-impl-fails2.t.orig Module-Implementation-0.05/t/one-impl-fails2.t
--- Module-Implementation-0.05/t/one-impl-fails2.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/one-impl-fails2.t	2012-02-10 10:53:07.463271310 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 2;
 
 {
     package T;
@@ -24,5 +24,3 @@ use Test::More 0.88;
     ok( T->can('return_42'),       'T package has a return_42 sub' );
     ok( !T->can('return_package'), 'T package has a return_package sub' );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/release-cpan-changes.t.orig Module-Implementation-0.05/t/release-cpan-changes.t
--- Module-Implementation-0.05/t/release-cpan-changes.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/release-cpan-changes.t	2012-02-10 10:53:07.463271310 +0000
@@ -1,15 +1,11 @@
 #!perl
 
+use Test::More;
+
 BEGIN {
-  unless ($ENV{RELEASE_TESTING}) {
-    require Test::More;
-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
-  }
+  plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING});
+  eval 'use Test::CPAN::Changes';
+  plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
 }
 
-
-use Test::More;
-eval 'use Test::CPAN::Changes';
-plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
 changes_ok();
-done_testing();
diff -up Module-Implementation-0.05/t/requested-fails.t.orig Module-Implementation-0.05/t/requested-fails.t
--- Module-Implementation-0.05/t/requested-fails.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/requested-fails.t	2012-02-10 10:53:07.463271310 +0000
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 1;
 use Test::Fatal;
 
 {
@@ -26,5 +26,3 @@ use Test::Fatal;
         'Got an exception when implementation requested in env value fails to load'
     );
 }
-
-done_testing();
diff -up Module-Implementation-0.05/t/taint.t.orig Module-Implementation-0.05/t/taint.t
--- Module-Implementation-0.05/t/taint.t.orig	2012-02-09 14:49:29.000000000 +0000
+++ Module-Implementation-0.05/t/taint.t	2012-02-10 10:53:42.164322515 +0000
@@ -7,7 +7,7 @@ use Test::Requires {
     'Test::Taint' => '0',
 };
 
-use Test::More 0.88;
+use Test::More tests => 3;
 use Test::Fatal;
 
 taint_checking_ok();
@@ -42,5 +42,3 @@ taint_checking_ok();
         'T::_implementation returns implementation set in ENV'
     );
 }
-
-done_testing();