diff -up Class-Load-0.08/t/000-load.t.orig Class-Load-0.08/t/000-load.t
--- Class-Load-0.08/t/000-load.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/000-load.t	2011-08-16 11:12:10.421565571 +0100
@@ -1,12 +1,10 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More tests => 1;
 
 use lib 't/lib';
 
 use_ok 'Test::Class::Load';
 
 diag('Using ' . Class::Load->_implementation() . ' implementation' );
-
-done_testing;
diff -up Class-Load-0.08/t/001-is-class-loaded.t.orig Class-Load-0.08/t/001-is-class-loaded.t
--- Class-Load-0.08/t/001-is-class-loaded.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/001-is-class-loaded.t	2011-08-16 11:12:10.421565571 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More tests => 18;
 
 use version;
 
@@ -110,5 +110,3 @@ ok(!is_class_loaded('Class::Load::Versio
    'Class::Load::VersionCheck has been loaded but the version check failed');
 ok(is_class_loaded('Class::Load::VersionCheck', {-version => 41}),
    'Class::Load::VersionCheck has been loaded and the version check passed');
-
-done_testing;
diff -up Class-Load-0.08/t/002-try-load-class.t.orig Class-Load-0.08/t/002-try-load-class.t
--- Class-Load-0.08/t/002-try-load-class.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/002-try-load-class.t	2011-08-16 11:12:10.421565571 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More tests => 18;
 use lib 't/lib';
 use Test::Class::Load ':all';
 
@@ -35,5 +35,3 @@ ok(try_load_class('Class::Load::VersionC
 
 ok(try_load_class('Class::Load::VersionCheck2', { -version => 41 }));
 ok(!try_load_class('Class::Load::VersionCheck2', { -version => 43 }));
-
-done_testing;
diff -up Class-Load-0.08/t/003-load-class.t.orig Class-Load-0.08/t/003-load-class.t
--- Class-Load-0.08/t/003-load-class.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/003-load-class.t	2011-08-16 11:12:10.422565569 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More tests => 19;
 use lib 't/lib';
 use Test::Class::Load ':all';
 use Test::Fatal;
@@ -52,5 +52,3 @@ like( exception {
 like( exception {
     load_class('__PACKAGE__')
 }, qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm' );
-
-done_testing;
diff -up Class-Load-0.08/t/004-load-double.t.orig Class-Load-0.08/t/004-load-double.t
--- Class-Load-0.08/t/004-load-double.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/004-load-double.t	2011-08-16 11:12:10.422565569 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 2;
 use lib 't/lib';
 use Test::Class::Load ':all';
 use Test::Fatal;
@@ -24,5 +24,3 @@ like( exception {
 like( exception {
     load_class('Class::Load::SyntaxError');
 }, qr/syntax error/ );
-
-done_testing;
diff -up Class-Load-0.08/t/005-load-optional.t.orig Class-Load-0.08/t/005-load-optional.t
--- Class-Load-0.08/t/005-load-optional.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/005-load-optional.t	2011-08-16 11:12:10.422565569 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More 0.88;
+use Test::More tests => 8;
 use Test::Fatal;
 use lib 't/lib';
 use Test::Class::Load qw( :all );
@@ -39,5 +39,3 @@ is( load_optional_class('Class::Load::Ve
     'VersionCheck (with too-high version) => 0');
 is( load_optional_class('Class::Load::VersionCheck', {-version => 41}), 1,
     'VersionCheck (with ok version) => 1');
-
-done_testing;
diff -up Class-Load-0.08/t/006-returned-error.t.orig Class-Load-0.08/t/006-returned-error.t
--- Class-Load-0.08/t/006-returned-error.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/006-returned-error.t	2011-08-16 11:12:10.422565569 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More 0.88;
+use Test::More tests => 15;
 use lib 't/lib';
 use Test::Class::Load ':all';
 
@@ -45,5 +45,3 @@ ok(!is_class_loaded('Class::Load::Syntax
     ok(!try_load_class('Class::Load::Nonexistent'), "didn't load class Nonexistent");
     is($@, "foo");
 }
-
-done_testing;
diff -up Class-Load-0.08/t/007-first-existing.t.orig Class-Load-0.08/t/007-first-existing.t
--- Class-Load-0.08/t/007-first-existing.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/007-first-existing.t	2011-08-16 11:12:10.423565567 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Test::Fatal;
-use Test::More 0.88;
+use Test::More tests => 12;
 use lib 't/lib';
 use Test::Class::Load 'load_first_existing_class';
 
@@ -120,5 +120,3 @@ is(
     'Class::Load::VersionCheck2',
     'load_first_existing_class returns loadable class when a class passes the version check'
 );
-
-done_testing;
diff -up Class-Load-0.08/t/008-gvstash-bug.t.orig Class-Load-0.08/t/008-gvstash-bug.t
--- Class-Load-0.08/t/008-gvstash-bug.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/008-gvstash-bug.t	2011-08-16 11:12:10.423565567 +0100
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Test::Fatal;
-use Test::More 0.88;
+use Test::More tests => 3;
 use lib 't/lib';
 use Test::Class::Load 'load_class';
 
@@ -20,5 +20,3 @@ is( exception {
     Class::Load::Stash->a_method;
 }, undef,
 'Actually loaded Class::Load::Stash - we were not fooled by mention of this stash in Class::Load::Stash::Sub' );
-
-done_testing;
diff -up Class-Load-0.08/t/release-cpan-changes.t.orig Class-Load-0.08/t/release-cpan-changes.t
--- Class-Load-0.08/t/release-cpan-changes.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/release-cpan-changes.t	2011-08-16 11:12:47.310490836 +0100
@@ -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 Class-Load-0.08/t/release-pod-coverage.t.orig Class-Load-0.08/t/release-pod-coverage.t
--- Class-Load-0.08/t/release-pod-coverage.t.orig	2011-08-16 03:19:07.000000000 +0100
+++ Class-Load-0.08/t/release-pod-coverage.t	2011-08-16 11:12:10.423565567 +0100
@@ -11,7 +11,7 @@ BEGIN {
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 1;
 
 use Test::Requires {
     'Test::Pod::Coverage' => '1.04',
@@ -44,5 +44,3 @@ for my $module ( sort @modules ) {
         "Pod coverage for $module"
     );
 }
-
-done_testing();