--- old/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2017-02-06 18:15:30.324872500 +0530
+++ new/test/java/awt/SplashScreen/FullscreenAfterSplash/FullScreenAfterSplash.java	2017-02-06 18:15:29.435755000 +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
@@ -21,20 +21,23 @@
 * questions.
 */
 
-import jdk.testlibrary.OSInfo;
-import java.awt.*;
-import java.awt.Robot;
-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 jdk.testlibrary.OSInfo;
+ 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.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 ../
@@ -45,6 +48,7 @@
  * @build GenerateTestImage
  * @run main GenerateTestImage
  * @author Petr Pchelko area=awt.event
+ * @compile FullScreenAfterSplash.java
  * @run main/othervm -splash:test.png FullScreenAfterSplash
  */
 public class FullScreenAfterSplash {
@@ -71,8 +75,11 @@
             sleep();
 
             Point fullScreenButtonPos = frame.getLocation();
-            fullScreenButtonPos.translate(frame.getWidth() - 10, 10);
-            r.mouseMove(fullScreenButtonPos.x, fullScreenButtonPos.y);
+            if(System.getProperty("os.version").equals("10.9"))
+                fullScreenButtonPos.translate(frame.getWidth() - 10, frame.getHeight()/2);
+            else
+                fullScreenButtonPos.translate(55,frame.getHeight()/2); 
+                r.mouseMove(fullScreenButtonPos.x, fullScreenButtonPos.y);
 
             //Cant use waitForIdle for full screen transition.
             int waitCount = 0;