--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Mon Dec 19 12:47:54 2016 -0800
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java	Mon Dec 19 13:50:29 2016 -0800
@@ -56,8 +56,6 @@
     private static final  String TEST_SRC = System.getProperty("test.src");
     private static final  String OSNAME = System.getProperty("os.name");
     private static final  String ARCH;
-    private static final  String LIBARCH;
-
     static {
         // magic with os.arch
         String osarch = System.getProperty("os.arch");
@@ -84,7 +82,6 @@
                 ARCH = osarch;
             }
         }
-        LIBARCH = ARCH.equals("i586") ? "i386" : ARCH;
     }
 
     public static void main(String[] args) throws Exception {
@@ -184,15 +181,12 @@
     }
 
     private static Path findLibjvm(FileSystem FS) {
-        Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "jre", "lib", LIBARCH));
-        if (libjvmPath == null) {
-            libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib", LIBARCH));
-        }
+        Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib"));
         return libjvmPath;
     }
 
     private static Path findLibjvm(Path libPath) {
-        // ARCH/libjvm.so -> ARCH/server/libjvm.so -> ARCH/client/libjvm.so
+        // libjvm.so -> server/libjvm.so -> client/libjvm.so
         Path libjvmPath = libPath.resolve("libjvm.so");
         if (isFileOk(libjvmPath)) {
             return libjvmPath;