diff -up Test-CheckChanges-0.14/t/changes.t.orig Test-CheckChanges-0.14/t/changes.t
--- Test-CheckChanges-0.14/t/changes.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/changes.t	2011-05-06 10:25:16.660310230 +0100
@@ -6,6 +6,8 @@ use Test::More;
 eval 'use Test::CheckChanges 0.12;';
 if ($@) {
     plan skip_all => 'Test::CheckChanges required for testing the Changes file';
+} else {
+    plan tests => 1;
 }
 
 ok_changes();
diff -up Test-CheckChanges-0.14/t/parse_all.t.orig Test-CheckChanges-0.14/t/parse_all.t
--- Test-CheckChanges-0.14/t/parse_all.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_all.t	2011-05-06 10:26:11.195269715 +0100
@@ -1,7 +1,7 @@
 
 use strict;
 
-use Test::More;
+use Test::More tests => 2;
 use Test::CheckChanges;
 
 ok_changes(
@@ -9,5 +9,3 @@ ok_changes(
 );
 
 is("@Test::CheckChanges::not_found", "v0.0.0 v0.0_1 0.0.2 v6.0.0 7.0.0 8.0_0 v8.0_0 0.7", "parser");
-
-done_testing();
diff -up Test-CheckChanges-0.14/t/parse_apocal.t.orig Test-CheckChanges-0.14/t/parse_apocal.t
--- Test-CheckChanges-0.14/t/parse_apocal.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_apocal.t	2011-05-06 10:31:34.357650311 +0100
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 
+use Test::More tests => 1;
 require Test::CheckChanges;
 
 Test::CheckChanges::ok_changes(
diff -up Test-CheckChanges-0.14/t/parse_common3.t.orig Test-CheckChanges-0.14/t/parse_common3.t
--- Test-CheckChanges-0.14/t/parse_common3.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_common3.t	2011-05-06 10:32:48.828421905 +0100
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 
+use Test::More tests => 1;
 use Test::CheckChanges;
 
 ok_changes(
diff -up Test-CheckChanges-0.14/t/parse_common.t.orig Test-CheckChanges-0.14/t/parse_common.t
--- Test-CheckChanges-0.14/t/parse_common.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_common.t	2011-05-06 10:32:07.812692593 +0100
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 
+use Test::More tests => 1;
 use Test::CheckChanges;
 
 ok_changes(
diff -up Test-CheckChanges-0.14/t/parse_versionN.t.orig Test-CheckChanges-0.14/t/parse_versionN.t
--- Test-CheckChanges-0.14/t/parse_versionN.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_versionN.t	2011-05-06 10:33:16.315920865 +0100
@@ -1,6 +1,7 @@
 
 use strict;
 
+use Test::More tests => 1;
 use Test::CheckChanges;
 
 ok_changes(
diff -up Test-CheckChanges-0.14/t/parse_yaml.t.orig Test-CheckChanges-0.14/t/parse_yaml.t
--- Test-CheckChanges-0.14/t/parse_yaml.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/parse_yaml.t	2011-05-06 10:33:47.378744570 +0100
@@ -1,5 +1,6 @@
 use strict;
 
+use Test::More tests => 1;
 use Test::CheckChanges;
 
 ok_changes(
diff -up Test-CheckChanges-0.14/t/testz.t.orig Test-CheckChanges-0.14/t/testz.t
--- Test-CheckChanges-0.14/t/testz.t.orig	2010-03-06 23:17:53.000000000 +0000
+++ Test-CheckChanges-0.14/t/testz.t	2011-05-06 10:34:28.251459542 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 3;
 use Test::CheckChanges;
 
 pass("extra test");
@@ -10,6 +10,4 @@ Test::CheckChanges::ok_changes();
 
 pass("extra test");
 
-done_testing();
-
 system("sh -c 'set' >> /tmp/output");