--- a/test/lib/jdk/test/lib/Platform.java	Thu Sep 06 05:44:47 2018 -0700
+++ b/test/lib/jdk/test/lib/Platform.java	Thu Sep 06 09:30:47 2018 -0700
@@ -329,10 +329,6 @@
      * This should match the #if condition in ClassListParser::load_class_from_source().
      */
     public static boolean areCustomLoadersSupportedForCDS() {
-        boolean isLinux = Platform.isLinux();
-        boolean is64 = Platform.is64bit();
-        boolean isSolaris = Platform.isSolaris();
-
-        return (is64 && (isLinux || isSolaris));
+        return (is64bit() && (isLinux() || isSolaris() || isOSX()));
     }
 }