diff --git a/src/share/classes/sun/awt/OSInfo.java b/src/share/classes/sun/awt/OSInfo.java
index c8cce594b63921fd86e912cde147dff4f158e732..58dd6cc1fd0606ec573069ee4bfd0b599d09e463 100644
--- a/src/share/classes/sun/awt/OSInfo.java
+++ b/src/share/classes/sun/awt/OSInfo.java
@@ -39,6 +39,7 @@ public class OSInfo {
         WINDOWS,
         LINUX,
         SOLARIS,
+        MACOSX,
         UNKNOWN
     }
 
@@ -100,6 +101,10 @@ public class OSInfo {
                 return SOLARIS;
             }
 
+            if (osName.startsWith("Mac OS X")) {
+                return MACOSX;
+            }
+
             // determine another OS here
         }
 
diff --git a/test/javax/swing/UITest/UITest.java b/test/javax/swing/UITest/UITest.java
new file mode 100644
index 0000000000000000000000000000000000000000..413bd1f3ee696312d0d0b2406d93104d15279b24
--- /dev/null
+++ b/test/javax/swing/UITest/UITest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2012, 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.
+ */
+
+/*
+ * @test
+ * @bug 4843282 4886871
+ * @summary Makes sure windows is only listed on Windows platform, and
+ *          GTK is not on Windows and Mac.
+ * added as tabs
+ * @author Scott Violet
+ */
+import javax.swing.*;
+import javax.swing.UIManager.LookAndFeelInfo;
+import sun.awt.OSInfo;
+import sun.awt.OSInfo.OSType;
+
+public class UITest {
+
+    public static void main(String[] args) {
+        OSType os = OSInfo.getOSType();
+        LookAndFeelInfo[] lafInfo = UIManager.getInstalledLookAndFeels();
+
+        switch (os) {
+            case WINDOWS:
+
+                // Make sure we don't have GTK.
+                if (hasLAF("gtk", lafInfo)) {
+                    throw new RuntimeException("On windows, but GTK is present");
+                }
+
+                // Make sure we don't have Aqua.
+                if (hasLAF("mac", lafInfo)) {
+                    throw new RuntimeException("On windows, but Aqua is present");
+                }
+
+                // Make sure we have Windows.
+                if (!hasLAF("windows", lafInfo)) {
+                    throw new RuntimeException("On windows and don't have Windows");
+                }
+
+                break;
+
+            case MACOSX:
+
+                // Make sure we don't have GTK.
+                if (hasLAF("gtk", lafInfo)) {
+                    throw new RuntimeException("On mac, but GTK is present");
+                }
+
+                // Make sure we don't have Windows.
+                if (hasLAF("windows", lafInfo)) {
+                    throw new RuntimeException("On mac, but Windows is present");
+                }
+
+                // Make sure we have Aqua.
+                if (!hasLAF("mac", lafInfo)) {
+                    throw new RuntimeException("On mac and don't have Aqua");
+                }
+
+                break;
+
+            default:
+                // Not windows and mac
+
+                // Make sure we don't have Windows.
+                if (hasLAF("windows", lafInfo)) {
+                    throw new RuntimeException("Not on windows and have Windows");
+                }
+
+                // Make sure we don't have Aqua.
+                if (hasLAF("mac", lafInfo)) {
+                    throw new RuntimeException("Not on mac and have Aqua");
+                }
+
+                // Make sure we have GTK.
+                if (!hasLAF("gtk", lafInfo)) {
+                    throw new RuntimeException(
+                            "Not on Windows and Mac and don't have GTK!");
+                }
+        }
+
+    }
+
+    public static boolean hasLAF(String name, LookAndFeelInfo[] lafInfo) {
+
+        for (int counter = 0; counter < lafInfo.length; counter++) {
+            if (lafInfo[counter].getName().toLowerCase().indexOf(name) != -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+}