--- old/test/lib/jdk/test/lib/Platform.java	2018-08-30 10:25:26.879628095 -0700
+++ new/test/lib/jdk/test/lib/Platform.java	2018-08-30 10:25:26.518593977 -0700
@@ -354,10 +354,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()));
     }
 }