diff --git a/jdk/src/java.desktop/share/classes/module-info.java b/jdk/src/java.desktop/share/classes/module-info.java
index b001e1a30cd..17bff50f8c7 100644
--- a/jdk/src/java.desktop/share/classes/module-info.java
+++ b/jdk/src/java.desktop/share/classes/module-info.java
@@ -112,6 +112,8 @@ module java.desktop {
 
     opens javax.swing.plaf.basic to
         jdk.jconsole;
+    opens com.sun.java.swing.plaf.windows to
+        jdk.jconsole;
 
     uses java.awt.im.spi.InputMethodDescriptor;
     uses javax.accessibility.AccessibilityProvider;
diff --git a/jdk/src/java.desktop/windows/classes/module-info.java.extra b/jdk/src/java.desktop/windows/classes/module-info.java.extra
deleted file mode 100644
index 9cd11e34a91..00000000000
--- a/jdk/src/java.desktop/windows/classes/module-info.java.extra
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-opens com.sun.java.swing.plaf.windows to jdk.jconsole;
diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
index 7e07c517a28..74b2890c563 100644
--- a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
+++ b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
@@ -23,7 +23,6 @@
 
 /* @test
    @bug 6824600
-   @requires (os.family == "windows")
    @summary OOM occurs when setLookAndFeel() is executed in Windows L&F(XP style)
    @author Pavel Porvatov
    @modules java.desktop/com.sun.java.swing.plaf.windows
diff --git a/jdk/test/javax/swing/JButton/4796987/bug4796987.java b/jdk/test/javax/swing/JButton/4796987/bug4796987.java
index 65698791bfb..52d2a32120f 100644
--- a/jdk/test/javax/swing/JButton/4796987/bug4796987.java
+++ b/jdk/test/javax/swing/JButton/4796987/bug4796987.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4796987
- * @requires (os.family == "windows")
  * @summary XP Only: JButton.setBorderPainted() does not work with XP L&F
  * @author Alexander Scherbatiy
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
index ffa07264681..e96e2cd45a8 100644
--- a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
+++ b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java
@@ -25,7 +25,6 @@
    @test
    @key headful
    @bug 4199622
-   @requires (os.family == "windows")
    @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation
    @author Vladislav Karnaukhov
    @library ../../../../lib/testlibrary
diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
index 65afea9d60e..747418bf7b1 100644
--- a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
+++ b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java
@@ -39,7 +39,6 @@ import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
  * @test
  * @key headful
  * @bug 8015300
- * @requires (os.family == "windows")
  * @summary Tests that editable combobox selects all text.
  * @author Sergey Malenkov
  * @library ../../../../lib/testlibrary/
diff --git a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
index 21b840787e9..deed68deb17 100644
--- a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
+++ b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8046391
- * @requires (os.family == "windows")
  * @summary JFileChooser hangs if displayed in Windows L&F
  * @author Alexey Ivanov
  * @library ../../../../lib/testlibrary
diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
index 71d52ff2d4f..c56eaddc69d 100644
--- a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
+++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java
@@ -24,7 +24,6 @@
 /* @test
  * @key headful
  * @bug 6725409
- * @requires (os.family == "windows")
  * @summary Checks that JInternalFrame's system menu
  *          can be localized during run-time
  * @author Mikhail Lapshin
diff --git a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
index 7e52135c94f..f819d247d96 100644
--- a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
+++ b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java
@@ -23,7 +23,6 @@
 
 /* @test
  * @bug 6524424
- * @requires (os.family == "windows")
  * @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings
  * @author Pavel Porvatov
  * @modules java.desktop/com.sun.java.swing.plaf.windows
diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
index e0b40d93919..440dbe4e23b 100644
--- a/jdk/test/javax/swing/JTree/8004298/bug8004298.java
+++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java
@@ -25,7 +25,6 @@
  * @test
  * @key headful
  * @bug 8004298
- * @requires (os.family == "windows")
  * @summary NPE in WindowsTreeUI.ensureRowsAreVisible
  * @author Alexander Scherbatiy
  * @library ../../regtesthelpers
diff --git a/jdk/test/javax/swing/border/Test4856008.java b/jdk/test/javax/swing/border/Test4856008.java
index dd28834cd59..398fefb51a1 100644
--- a/jdk/test/javax/swing/border/Test4856008.java
+++ b/jdk/test/javax/swing/border/Test4856008.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 4856008 7025987
- * @requires (os.family == "windows")
  * @summary Tests border insets
  * @author Sergey Malenkov
  * @modules java.desktop/com.sun.java.swing.plaf.motif
diff --git a/jdk/test/javax/swing/border/Test6978482.java b/jdk/test/javax/swing/border/Test6978482.java
index 89634055591..b9f30e531e0 100644
--- a/jdk/test/javax/swing/border/Test6978482.java
+++ b/jdk/test/javax/swing/border/Test6978482.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 6978482 7025987
- * @requires (os.family == "windows")
  * @summary Tests unchecked casts
  * @author Sergey Malenkov
  * @modules java.desktop/com.sun.java.swing.plaf.motif