diff --git a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
index 7bbb230787f..02d891990b2 100644
--- a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
+++ b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java
@@ -29,7 +29,7 @@
 /* @test
  * @bug 7129742
  * @summary Focus in non-editable TextArea is not shown on Linux.
- * @requires (os.family == "linux" | os.name == "solaris")
+ * @requires (os.family == "linux" | os.family == "solaris")
  * @modules java.desktop/sun.awt
  *          java.desktop/java.awt.peer
  *          java.desktop/sun.awt.X11
diff --git a/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java b/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java
index ae07ffc989f..954445e226f 100644
--- a/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java
+++ b/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8012586
  * @summary verify that modal dialog will appeared above fullscreen window under Metacity WM.
- * @requires (os.name == "linux" | os.name == "solaris")
+ * @requires (os.family == "linux" | os.family == "solaris")
  * @modules java.desktop/sun.awt.X11
  * @library ../../regtesthelpers
  * @build Util
diff --git a/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java b/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java
index 96506bf0f3f..52f37b3f172 100644
--- a/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java
+++ b/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java
@@ -28,7 +28,7 @@
   @bug      7043963
   @summary  Tests  that the screen location of windows is
             updated properly after a maximize.
-  @requires (os.name == "linux" | os.name == "solaris")
+  @requires (os.family == "linux" | os.family == "solaris")
   @modules java.desktop/sun.awt.X11
   @author   Denis Lila
   @library  ../../regtesthelpers
diff --git a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
index 67ec62c88c6..6c4876245d2 100644
--- a/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
+++ b/jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java
@@ -27,7 +27,7 @@
             regardless of jdk.gtk.version flag values.
   @bug 8156121
   @key headful
-  @requires (os.name == "linux" | os.name == "solaris")
+  @requires (os.family == "linux" | os.family == "solaris")
   @run main/othervm -Djdk.gtk.version=2 DemandGTK
   @run main/othervm -Djdk.gtk.version=3 DemandGTK
 */