--- old/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2017-01-04 17:07:51.667311500 +0530
+++ new/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2017-01-04 17:07:50.698451000 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,19 +22,22 @@
 */
 
 import jdk.testlibrary.OSInfo;
-import java.awt.*;
+import java.awt.Point;
 import java.awt.Robot;
+import java.awt.Window;
 import java.awt.event.InputEvent;
 import java.lang.InterruptedException;
 import java.lang.System;
 import java.lang.Thread;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import javax.swing.*;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 
 /*
  * @test
- * @bug 8024185
+ * @bug 8024185 8140329 
  * @summary Native Mac OS X full screen does not work after showing the splash
  * @requires (os.family == "mac")
  * @library ../
--- old/test/java/awt/SplashScreen/GenerateTestImage.java	2017-01-04 17:07:57.308614700 +0530
+++ new/test/java/awt/SplashScreen/GenerateTestImage.java	2017-01-04 17:07:56.417851600 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013,2017 Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,9 @@
 * questions.
 */
 
+import java.awt.Color;
+import java.awt.Graphics2D;
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,7 +35,7 @@
     private static final int IMAGE_SIZE = 20;
 
     public static void main(String[] args) throws Exception {
-        String path = System.getProperty("test.classes") + File.separator + "test.png";
+        String path = System.getProperty("user.dir") + File.separator + "test.png";
 
         BufferedImage image = new BufferedImage(IMAGE_SIZE, IMAGE_SIZE, BufferedImage.TYPE_INT_ARGB);
         Graphics2D graphics2D = image.createGraphics();