--- a/langtools/test/tools/javac/Paths/MineField.sh	Thu Oct 20 13:44:51 2016 -0700
+++ b/langtools/test/tools/javac/Paths/MineField.sh	Thu Oct 20 16:31:42 2016 -0700
@@ -109,9 +109,15 @@
 echo 'public class Main {public static void main(String[] a) {Lib.f();}}' > Main.java
 
 # Create a jar file that is good enough to put on the javac boot class path (i.e. contains java.lang.**)
-Sys "$jimage" extract --dir modules ${TESTJAVA}/lib/modules
-Sys "$jar" cf java-lang.jar -C modules/java.base java/lang
-Sys rm -rf modules
+if [ -r ${TESTJAVA}/lib/modules ]; then
+  Sys "$jimage" extract --dir modules ${TESTJAVA}/lib/modules
+  Sys "$jar" cf java-lang.jar -C modules/java.base java/lang
+  Sys rm -rf modules
+elif [ -d ${TESTJAVA}/modules ]; then
+  Sys "$jar" cf java-lang.jar -C ${TESTJAVA}/modules/java.base java/lang
+else
+  echo 'cannot create java-lang.jar' ; exit 1
+fi
 
 #----------------------------------------------------------------
 # Verify that javac class search order is the same as java's

--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java	Thu Oct 20 13:44:51 2016 -0700
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest.java	Thu Oct 20 16:31:42 2016 -0700
@@ -21,8 +21,11 @@
  * questions.
  */
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
 import javax.tools.ToolProvider;
-import java.util.Objects;
 
 /**
  * @test
@@ -36,6 +39,18 @@
 // run in other vm to ensure the initialization code path is exercised.
 public class ToolProviderTest {
     public static void main(String... args) {
+        // The following code allows the test to be skipped when run on
+        // an exploded image.
+        // See https://bugs.openjdk.java.net/browse/JDK-8155858
+        Path javaHome = Paths.get(System.getProperty("java.home"));
+        Path image = javaHome.resolve("lib").resolve("modules");
+        Path modules = javaHome.resolve("modules");
+        if (!Files.exists(image) && Files.exists(modules)) {
+            System.err.println("Test running on exploded image");
+            System.err.println("Test skipped!");
+            return;
+        }
+
         System.setSecurityManager(new SecurityManager());
 
         Objects.requireNonNull(ToolProvider.getSystemDocumentationTool());

--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Thu Oct 20 13:44:51 2016 -0700
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Thu Oct 20 16:31:42 2016 -0700
@@ -31,6 +31,7 @@
  */
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -84,7 +85,9 @@
                     continue;
                 if (type.endsWith("module-info"))
                     continue;
-                String moduleName = fm.asPath(file).getName(1).toString();
+                Path path = fm.asPath(file);
+                int moduleIndex = path.getNameCount() - type.split("\\Q.\\E").length - 1;
+                String moduleName = path.getName(moduleIndex).toString();
                 try {
                     ModuleElement me = elements.getModuleElement(moduleName);
                     me.getClass();