diff --git a/jdk/test/sun/misc/Cleaner/ExitOnThrow.java b/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
index 03ea83d9d45..f4fd8021748 100644
--- a/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
+++ b/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
@@ -28,21 +28,17 @@ import sun.misc.*;
 
 public class ExitOnThrow {
 
-    private static volatile boolean ran = false;
-
     public static void main(String[] args) throws Exception {
         Cleaner.create(new Object(),
                        new Runnable() {
                                public void run() {
-                                   ran = true;
                                    throw new RuntimeException("Foo!");
                                }
                            });
-        while (!ran) {
+        while (true) {
             System.gc();
             Thread.sleep(100);
         }
-        System.exit(0);
     }
 
 }
diff --git a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
index 7506ce4403f..4a22114ab18 100644
--- a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
+++ b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
@@ -25,7 +25,7 @@
 
 #
 # @test
-# @bug 4954921
+# @bug 4954921 8009259
 # @summary Ensure that if a cleaner throws an exception then the VM exits
 #
 # @build ExitOnThrow