--- /dev/null	2015-10-22 06:49:40.033425512 -0400
+++ new/test/java/awt/Robot/HiDPIScreenCapture/HiDPIRobotScreenCaptureTest.java	2015-10-22 10:07:34.215072617 -0400
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
+import javax.swing.UIManager;
+
+/* @test
+ * @bug 8073320 8137571
+ * @summary Windows and Linux HiDPI Graphics support
+ * @author Alexander Scherbatiy
+ * @requires (os.family == "windows" | os.family == "linux")
+ * @run main/othervm -Dsun.java2d.uiScale=2 HiDPIRobotScreenCaptureTest
+ */
+public class HiDPIRobotScreenCaptureTest {
+
+    private static final Color[] COLORS = {
+        Color.GREEN, Color.BLUE, Color.ORANGE, Color.RED};
+
+    private static final String[] SUPPORTED_LAFS = {
+        "com.sun.java.swing.plaf.windows.WindowsLookAndFeel",
+        "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+    };
+
+    public static void main(String[] args) throws Exception {
+
+        if (!setSupportedLAF()) {
+            return;
+        }
+
+        Frame frame = new Frame();
+        frame.setBounds(10, 20, 200, 150);
+        frame.setUndecorated(true);
+
+        Panel panel = new Panel(new BorderLayout());
+        Canvas canvas = new Canvas() {
+            @Override
+            public void paint(Graphics g) {
+                super.paint(g);
+                int w = getWidth();
+                int h = getHeight();
+                g.setColor(COLORS[0]);
+                g.fillRect(0, 0, w / 2, h / 2);
+                g.setColor(COLORS[1]);
+                g.fillRect(w / 2, 0, w / 2, h / 2);
+                g.setColor(COLORS[2]);
+                g.fillRect(0, h / 2, w / 2, h / 2);
+                g.setColor(COLORS[3]);
+                g.fillRect(w / 2, h / 2, w / 2, h / 2);
+            }
+        };
+
+        panel.add(canvas);
+        frame.add(panel);
+        frame.setVisible(true);
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        Thread.sleep(200);
+
+        Rectangle rect = canvas.getBounds();
+        rect.setLocation(canvas.getLocationOnScreen());
+
+        BufferedImage image = robot.createScreenCapture(rect);
+        frame.dispose();
+
+        int w = image.getWidth();
+        int h = image.getHeight();
+
+        if (w != frame.getWidth() || h != frame.getHeight()) {
+            throw new RuntimeException("Wrong image size!");
+        }
+
+        if (image.getRGB(w / 4, h / 4) != COLORS[0].getRGB()) {
+            throw new RuntimeException("Wrong image color!");
+        }
+
+        if (image.getRGB(3 * w / 4, h / 4) != COLORS[1].getRGB()) {
+            throw new RuntimeException("Wrong image color!");
+        }
+
+        if (image.getRGB(w / 4, 3 * h / 4) != COLORS[2].getRGB()) {
+            throw new RuntimeException("Wrong image color!");
+        }
+
+        if (image.getRGB(3 * w / 4, 3 * h / 4) != COLORS[3].getRGB()) {
+            throw new RuntimeException("Wrong image color!");
+        }
+    }
+
+    private static boolean setSupportedLAF() {
+
+        for (String supportedLAF : SUPPORTED_LAFS) {
+            try {
+                UIManager.setLookAndFeel(supportedLAF);
+                return true;
+            } catch (Exception ignored) {
+            }
+        }
+
+        return false;
+    }
+}
\ No newline at end of file