diff --git a/KNOWN_BUGS b/KNOWN_BUGS
index d723c1a..8d7dd5a 100644
--- a/KNOWN_BUGS
+++ b/KNOWN_BUGS
@@ -32,3 +32,12 @@ Bugs to fix before a 4.3 release
 * xen-list-images does not honour --extension
 
 * --extension='' (i.e. empty string) no more works
+
+
+Bugs to fix later
+-----------------
+
+t/xen-tools.t can't really test Xen::Tools as the latter requires a
+local Xen installation. For proper testing, a dummy set of Xen
+configuration files and configurable paths to them in Xen::Tools would
+be necessary.
diff --git a/t/xen-tools.t b/t/xen-tools.t
index 461c81d..cf797a6 100755
--- a/t/xen-tools.t
+++ b/t/xen-tools.t
@@ -6,7 +6,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 1, skip_all => 'Xen::Tools is not used for now';
+use Test::More skip_all => 'Xen::Tools is not used for now';
 
 SKIP: {
     skip "Test only works as root", 1 if $< > 0;
@@ -17,5 +17,7 @@ SKIP: {
         my $xt = Xen::Tools->new( hostname => 'xen-tools-test' );
 
         ok( $xt->isa('Xen::Tools') );
-    }
+    };
 }
+
+done_testing();