--- lib/ExtUtils/t/xs.t;-0	Sat Feb  2 18:21:58 2008
+++ lib/ExtUtils/t/xs.t	Sun Feb  3 09:51:31 2008
@@ -18,10 +18,13 @@ use File::Find;
 use File::Spec;
 use File::Path;
 
+my $skip_everything = 0;
+
 if( have_compiler() ) {
     plan tests => 7;
 }
 else {
+    $skip_everything = 1;
     plan skip_all => "ExtUtils::CBuilder not installed or couldn't find a compiler";
 }
 
@@ -39,8 +42,10 @@ $| = 1;
 
 ok( setup_xs(), 'setup' );
 END {
-    ok( chdir File::Spec->updir );
-    ok( teardown_xs(), 'teardown' );
+    unless ($skip_everything) {
+        ok( chdir File::Spec->updir );
+        ok( teardown_xs(), 'teardown' );
+    }
 }
 
 ok( chdir('XS-Test'), "chdir'd to XS-Test" ) ||