--- old/test/runtime/logging/ExceptionsTest.java	2016-01-12 14:50:55.880945640 -0500
+++ new/test/runtime/logging/ExceptionsTest.java	2016-01-12 14:50:55.743016447 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,27 +51,29 @@
         output.shouldHaveExitValue(0);
     }
 
+    // Each ProcessBuilder should disable CDS with -Xshare:off so that no steps
+    // that produce necessary logging are skipped.
     public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-            "-Xlog:exceptions=info", "-Xcomp",
+            "-Xlog:exceptions=info", "-Xshare:off", "-Xcomp",
             "-XX:CompileCommand=compileonly,ExceptionsTest$InternalClass::compileMe",
             InternalClass.class.getName());
         analyzeOutputOn(pb);
 
         pb = ProcessTools.createJavaProcessBuilder(
-            "-XX:+TraceExceptions", "-Xcomp",
+            "-XX:+TraceExceptions", "-Xshare:off", "-Xcomp",
             "-XX:CompileCommand=compileonly,ExceptionsTest$InternalClass::compileMe",
             InternalClass.class.getName());
         analyzeOutputOn(pb);
 
         pb = ProcessTools.createJavaProcessBuilder(
-            "-Xlog:exceptions=off", "-Xcomp",
+            "-Xlog:exceptions=off", "-Xshare:off", "-Xcomp",
             "-XX:CompileCommand=compileonly,ExceptionsTest$InternalClass::compileMe",
             InternalClass.class.getName());
         analyzeOutputOff(pb);
 
         pb = ProcessTools.createJavaProcessBuilder(
-            "-XX:-TraceExceptions", "-Xcomp",
+            "-XX:-TraceExceptions", "-Xshare:off", "-Xcomp",
             "-XX:CompileCommand=compileonly,ExceptionsTest$InternalClass::compileMe",
             InternalClass.class.getName());
         analyzeOutputOff(pb);