--- old/test/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java	2017-04-06 20:19:32.000000000 +0300
+++ new/test/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java	2017-04-06 20:19:32.000000000 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -30,15 +30,21 @@
 import java.awt.Rectangle;
 import java.awt.Robot;
 import java.awt.image.BufferedImage;
-import javax.swing.UIManager;
+
+import jdk.testlibrary.OSInfo;
 
 /* @test
  * @bug 8073320
  * @summary  Windows HiDPI support
- * @author Alexander Scherbatiy
- * @requires (os.family == "windows")
+ * @library ../../../../lib/testlibrary
+ * @build jdk.testlibrary.OSInfo
+ * @run main/othervm HiDPIRobotScreenCaptureTest
+ * @run main/othervm -Dsun.java2d.uiScale=1 HiDPIRobotScreenCaptureTest
+ * @run main/othervm -Dsun.java2d.uiScale=2 HiDPIRobotScreenCaptureTest
  * @run main/othervm -Dsun.java2d.win.uiScaleX=3 -Dsun.java2d.win.uiScaleY=2
  *                    HiDPIRobotScreenCaptureTest
+ * @run main/othervm -Dsun.java2d.win.uiScaleX=2 -Dsun.java2d.win.uiScaleY=3
+ *                    HiDPIRobotScreenCaptureTest
  */
 public class HiDPIRobotScreenCaptureTest {
 
@@ -46,16 +52,13 @@
         Color.GREEN, Color.BLUE, Color.ORANGE, Color.RED};
 
     public static void main(String[] args) throws Exception {
-
-        try {
-            UIManager.setLookAndFeel(
-                    "com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-        } catch (Exception e) {
+        if (!OSInfo.getOSType().equals(OSInfo.OSType.WINDOWS)
+                && System.getProperty("sun.java2d.win.uiScaleX") != null) {
             return;
         }
 
         Frame frame = new Frame();
-        frame.setBounds(40, 30, 400, 300);
+        frame.setBounds(97, 87, 101, 123);
         frame.setUndecorated(true);
 
         Panel panel = new Panel(new BorderLayout());
@@ -112,4 +115,4 @@
             throw new RuntimeException("Wrong image color!");
         }
     }
-}
\ No newline at end of file
+}