diff --git a/t/argument-check.t b/t/argument-check.t
index 5c7703e..3315e15 100755
--- a/t/argument-check.t
+++ b/t/argument-check.t
@@ -8,7 +8,7 @@
 #
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 
 #
 #  Open and parse the xen-tools.conf configuration file.
@@ -51,7 +51,7 @@ foreach my $key ( sort keys %OPTIONS )
     is( $found, 1 , " Found documentation for '$key'" );
 }
 
-
+done_testing();
 
 
 =head2 parseConfigFile
diff --git a/t/getopt.t b/t/getopt.t
index 22ae247..702049e 100755
--- a/t/getopt.t
+++ b/t/getopt.t
@@ -12,7 +12,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -26,6 +26,7 @@ foreach my $file ( sort( glob "./bin/*-*" ) )
     testFile( $file );
 }
 
+done_testing();
 
 #
 #  Check that the given file implements all the option processing it
diff --git a/t/hook-daemons.t b/t/hook-daemons.t
index 81e050c..8bd7343 100755
--- a/t/hook-daemons.t
+++ b/t/hook-daemons.t
@@ -8,7 +8,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 use File::Temp;
 
 
@@ -32,7 +32,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     }
 }
 
-
+done_testing();
 
 #
 #  If the given distribution has the following two files test them:
diff --git a/t/hook-hostname.t b/t/hook-hostname.t
index 808bc64..4457678 100755
--- a/t/hook-hostname.t
+++ b/t/hook-hostname.t
@@ -8,7 +8,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 use File::Temp;
 
 
@@ -33,7 +33,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     }
 }
 
-
+done_testing();
 
 
 #
diff --git a/t/hook-tls.t b/t/hook-tls.t
index 82252b3..d9cb3b8 100755
--- a/t/hook-tls.t
+++ b/t/hook-tls.t
@@ -15,10 +15,6 @@ if ( $Config::Config{archname} =~ /64/ )
 {
     plan skip_all => "This test will fail upon 64 bit systems" ;
 }
-else
-{
-    plan no_plan;
-}
 
 #
 #  Rather than having a hardwired list of distributions to test
@@ -38,7 +34,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     }
 }
 
-
+done_testing();
 
 
 #
diff --git a/t/hooks.t b/t/hooks.t
index 41d3ec9..0634788 100755
--- a/t/hooks.t
+++ b/t/hooks.t
@@ -7,7 +7,7 @@
 #
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -28,7 +28,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     }
 }
 
-
+done_testing();
 
 sub testDistroHooks
 {
diff --git a/t/no-tabs.t b/t/no-tabs.t
index 6358605..4511e35 100755
--- a/t/no-tabs.t
+++ b/t/no-tabs.t
@@ -9,7 +9,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -18,7 +18,7 @@ use Test::More qw( no_plan );
 #
 find( { wanted => \&checkFile, no_chdir => 1 }, '.' );
 
-
+done_testing();
 
 #
 #  Check a file.
diff --git a/t/perl-syntax.t b/t/perl-syntax.t
index 858b94b..5a5124c 100755
--- a/t/perl-syntax.t
+++ b/t/perl-syntax.t
@@ -11,7 +11,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw/ no_plan /;
+use Test::More;
 
 eval "use Moose";
 plan skip_all => "Moose required for testing Perl syntax"
@@ -24,6 +24,8 @@ plan skip_all => "Moose required for testing Perl syntax"
 #
 find( { wanted => \&checkFile, no_chdir => 1 }, '.' );
 
+done_testing();
+
 #
 #  Check a file.
 #
diff --git a/t/plugin-checks.t b/t/plugin-checks.t
index f82d13a..93e2896 100755
--- a/t/plugin-checks.t
+++ b/t/plugin-checks.t
@@ -9,7 +9,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -30,7 +30,7 @@ foreach my $dir ( glob( "hooks/*" ) )
     }
 }
 
-
+done_testing();
 
 =head2 testPlugins
 
diff --git a/t/pod-check.t b/t/pod-check.t
index 957a7be..e55d409 100755
--- a/t/pod-check.t
+++ b/t/pod-check.t
@@ -8,7 +8,7 @@
 #
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 
 foreach my $file ( glob( "bin/*-*" ) )
 {
@@ -30,3 +30,4 @@ foreach my $file ( glob( "bin/*-*" ) )
     }
 }
 
+done_testing();
diff --git a/t/portable-shell.t b/t/portable-shell.t
index aed25cd..5ecf60b 100755
--- a/t/portable-shell.t
+++ b/t/portable-shell.t
@@ -15,7 +15,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -24,7 +24,7 @@ use Test::More qw( no_plan );
 #
 find( { wanted => \&checkFile, no_chdir => 1 }, '.' );
 
-
+done_testing();
 
 #
 #  Check a file.
diff --git a/t/programs.t b/t/programs.t
index 31d327e..da5d891 100755
--- a/t/programs.t
+++ b/t/programs.t
@@ -6,7 +6,7 @@
 # --
 #
 
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -44,3 +44,4 @@ foreach my $file ( @optional )
     }
 }
 
+done_testing();
diff --git a/t/quoted-strings.t b/t/quoted-strings.t
index d6a655a..bf356a2 100755
--- a/t/quoted-strings.t
+++ b/t/quoted-strings.t
@@ -10,7 +10,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -23,7 +23,7 @@ $dir = "./hooks"  if ( -d "./hooks" );
 ok( defined( $dir ), "Found hook directory" );
 find( { wanted => \&checkFile, no_chdir => 1 }, $dir );
 
-
+done_testing();
 
 #
 #  Check a file; if it is a shell script.
diff --git a/t/shell-syntax.t b/t/shell-syntax.t
index cb25f1c..3e07557 100755
--- a/t/shell-syntax.t
+++ b/t/shell-syntax.t
@@ -9,7 +9,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -18,7 +18,7 @@ use Test::More qw( no_plan );
 #
 find( { wanted => \&checkFile, no_chdir => 1 }, '.' );
 
-
+done_testing();
 
 #
 #  Check a file.
diff --git a/t/test-trailing-whitespace.t b/t/test-trailing-whitespace.t
index 9c9b7c7..108107f 100755
--- a/t/test-trailing-whitespace.t
+++ b/t/test-trailing-whitespace.t
@@ -9,7 +9,7 @@
 
 use strict;
 use File::Find;
-use Test::More qw( no_plan );
+use Test::More;
 
 
 #
@@ -37,6 +37,7 @@ foreach my $file (sort( glob ( $dir . "*" ) ) )
     checkFile( $file );
 }
 
+done_testing();
 
 #
 #  Check a file.
diff --git a/t/xen-delete-image.t b/t/xen-delete-image.t
index 2a0e5ad..d912b75 100755
--- a/t/xen-delete-image.t
+++ b/t/xen-delete-image.t
@@ -9,7 +9,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 use File::Temp;
 
 
@@ -91,3 +91,5 @@ ok( ! -e $domains . "/" . $hostname . "/" . "swap.img",
 #
 ok( ! -d $domains . "/" . $hostname,
     "The hostname directory was removed" );
+
+done_testing();
diff --git a/t/xen-lists-images.t b/t/xen-lists-images.t
index bf996cd..dc3dbda 100755
--- a/t/xen-lists-images.t
+++ b/t/xen-lists-images.t
@@ -10,7 +10,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 use File::Temp;
 
 
@@ -26,7 +26,7 @@ testRandomInstance( "bar.my.flat", 1 );
 testRandomInstance( "baz.my.flat", 0 );
 testRandomInstance( "baz.my.flat", 1 );
 
-
+done_testing();
 
 =head2 testRandomInstance
 
diff --git a/t/xt-create-xen-config.t b/t/xt-create-xen-config.t
index e304f85..a4cd26e 100755
--- a/t/xt-create-xen-config.t
+++ b/t/xt-create-xen-config.t
@@ -9,7 +9,7 @@
 
 
 use strict;
-use Test::More qw( no_plan );
+use Test::More;
 use File::Temp;
 
 
@@ -107,7 +107,7 @@ noMentionOf( "phy:",
 
 
 
-
+done_testing();