--- a/test/lib/jdk/test/lib/JDKToolLauncher.java	Tue Apr 11 13:55:51 2017 -0700
+++ b/test/lib/jdk/test/lib/JDKToolLauncher.java	Tue Apr 11 21:59:23 2017 -0700
@@ -24,9 +24,7 @@
 package jdk.test.lib;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import jdk.test.lib.process.ProcessTools;
 
 /**
  * A utility for constructing command lines for starting JDK tool processes.
@@ -59,7 +57,6 @@
         } else {
             executable = JDKToolFinder.getTestJDKTool(tool);
         }
-        vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
     }
 
     /**

--- a/test/lib/jdk/test/lib/process/ProcessTools.java	Tue Apr 11 13:55:51 2017 -0700
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java	Tue Apr 11 21:59:23 2017 -0700
@@ -45,7 +45,6 @@
 import java.util.stream.Collectors;
 
 import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
 import jdk.test.lib.Utils;
 
 public final class ProcessTools {
@@ -315,20 +314,6 @@
         return args.toArray(new String[args.size()]);
     }
 
-    /**
-     * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
-     *
-     * @return String[] with platform specific arguments, empty if there are
-     *         none
-     */
-    public static String[] getPlatformSpecificVMArgs() {
-
-    if (Platform.is64bit() && Platform.isSolaris()) {
-            return new String[] { "-d64" };
-        }
-
-        return new String[] {};
-    }
 
 
     /**
@@ -353,7 +338,6 @@
 
         ArrayList<String> args = new ArrayList<>();
         args.add(javapath);
-        Collections.addAll(args, getPlatformSpecificVMArgs());
 
         args.add("-cp");
         args.add(System.getProperty("java.class.path"));