diff -r 88e2753a2334 -r 0fe62353385b test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java	Wed Oct 23 10:10:34 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java	Wed Oct 23 10:37:54 2019 -0400
@@ -593,18 +593,32 @@
     }
 
     public static void assertTrue(boolean actual, String msg) {
+        assertTrue(actual, msg, null);
+    }
+
+    public static void assertFalse(boolean actual, String msg) {
+        assertFalse(actual, msg, null);
+    }
+
+    public static void assertTrue(boolean actual, String msg, Runnable onFail) {
         currentTest.notifyAssert();
         if (!actual) {
-            error(concatMessages("Unexpected FALSE", msg));
+            if (onFail != null) {
+                onFail.run();
+            }
+            error(concatMessages("Failed", msg));
         }
 
         traceAssert(String.format("assertTrue(): %s", msg));
     }
 
-    public static void assertFalse(boolean actual, String msg) {
+    public static void assertFalse(boolean actual, String msg, Runnable onFail) {
         currentTest.notifyAssert();
         if (actual) {
-            error(concatMessages("Unexpected TRUE", msg));
+            if (onFail != null) {
+                onFail.run();
+            }
+            error(concatMessages("Failed", msg));
         }
 
         traceAssert(String.format("assertFalse(): %s", msg));