diff --git a/t/00-load.t b/t/00-load.t
deleted file mode 100755
index 8453394..0000000
--- a/t/00-load.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/perl -I../lib -I./lib
-
-use Test::More tests => 2;
-
-BEGIN {
-    use_ok( 'Xen::Tools' );
-    use_ok( 'Xen::Tools::Log' );
-}
-
-diag( "Testing Xen::Tools $Xen::Tools::VERSION, Perl $], $^X" );
diff --git a/t/modules.sh b/t/modules.sh
index ddba712..f99f0c4 100755
--- a/t/modules.sh
+++ b/t/modules.sh
@@ -7,7 +7,7 @@
 # --
 # http://www.steve.org.uk/
 #
-# $Id: modules.sh,v 1.1 2007-09-01 19:23:10 steve Exp $
+# $Id: modules.sh,v 1.2 2007-10-25 12:27:49 steve Exp $
 #
 
 cat <<EOF
@@ -26,7 +26,7 @@ use Test::More qw( no_plan );
 EOF
 
 
-for i in `rgrep '^use ' .. | grep -v Expect | awk '{print $2}' | tr -d 
\;\(\) | sort | uniq`; \
+for i in `rgrep '^use ' .. | grep -v Expect | grep -v Xen:: | grep -v Moose | awk '{print $2}' | tr -d 
\;\(\) | sort | uniq`; \
     do \
      echo "BEGIN{ use_ok( '$i' ); }"; \
      echo "require_ok( '$i' );" ; \
diff --git a/t/modules.t b/t/modules.t
index 86923f5..e9d9791 100755
--- a/t/modules.t
+++ b/t/modules.t
@@ -10,6 +10,10 @@
 
 use Test::More qw( no_plan );
 
+BEGIN{ use_ok( 'Carp' ); }
+require_ok( 'Carp' );
+
+
 BEGIN{ use_ok( 'Config' ); }
 require_ok( 'Config' );
 
@@ -38,6 +42,10 @@ BEGIN{ use_ok( 'File::Path' ); }
 require_ok( 'File::Path' );
 
 
+BEGIN{ use_ok( 'File::Spec' ); }
+require_ok( 'File::Spec' );
+
+
 BEGIN{ use_ok( 'File::Temp' ); }
 require_ok( 'File::Temp' );
 
@@ -50,6 +58,10 @@ BEGIN{ use_ok( 'Pod::Usage' ); }
 require_ok( 'Pod::Usage' );
 
 
+BEGIN{ use_ok( 'POSIX' ); }
+require_ok( 'POSIX' );
+
+
 BEGIN{ use_ok( 'strict' ); }
 require_ok( 'strict' );