--- a/jdk/test/java/awt/print/PrinterJob/PaintText.java	Fri Oct 23 10:50:34 2015 -0700
+++ b/jdk/test/java/awt/print/PrinterJob/PaintText.java	Tue Oct 27 14:14:08 2015 +0300
@@ -75,8 +75,8 @@
         f.show();
 
         /* Non-jtreg execution will display the dialog */
-        if (System.getProperty("test.java") == null) {
-             if (!pjob.printDialog()) {
+        if (System.getProperty("test.jdk") == null) {
+            if (!pjob.printDialog()) {
                 return;
             }
         }
@@ -84,6 +84,8 @@
             pjob.print();
         } catch (PrinterException e) {
             throw new RuntimeException(e.getMessage());
+        } finally {
+            f.dispose();
         }
     }