diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 2e7d5d9e9d21318a85f49fd262bd8ce83561d365..576318bd682ea99449ff4cd6cac319f14758ccbc 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-19  Tom Tromey  <tromey@redhat.com>
+
+	* libjava.verify/verify.exp (gcj_verify_list_tests): Only change
+	directory if new directory exists.
+
 2003-07-13  Tom Tromey  <tromey@redhat.com>
 
 	* libjava.verify/verify.exp: Fixed variable init.
diff --git a/libjava/testsuite/libjava.verify/verify.exp b/libjava/testsuite/libjava.verify/verify.exp
index 456f3b6623048dc81e2905628114e2afc34868ce..76c9b00d4bf04e3686303b10e0b44d67b94ee2d3 100644
--- a/libjava/testsuite/libjava.verify/verify.exp
+++ b/libjava/testsuite/libjava.verify/verify.exp
@@ -11,12 +11,14 @@ set {gcj_verify_xfail(gij verify of subr.fail.jsr8)} 1
 
 proc gcj_verify_list_tests {srcdir} {
   set result {}
-  set here [pwd]
-  cd $srcdir
-  foreach item [lsort [glob -nocomplain */*/*.class]] {
-    lappend result [file rootname $item]
+  if {[file exists $srcdir]} {
+    set here [pwd]
+    cd $srcdir
+    foreach item [lsort [glob -nocomplain */*/*.class]] {
+      lappend result [file rootname $item]
+    }
+    cd $here
   }
-  cd $here
   return $result
 }