--- old/test/runtime/logging/SafepointTest.java	2016-01-12 14:50:55.885383808 -0500
+++ new/test/runtime/logging/SafepointTest.java	2016-01-12 14:50:55.753688750 -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
@@ -37,9 +37,11 @@
 import jdk.test.lib.ProcessTools;
 
 public class SafepointTest {
+    // 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:safepoint=trace", InnerClass.class.getName());
+            "-Xlog:safepoint=trace", "-Xshare:off", InnerClass.class.getName());
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("Safepoint synchronization initiated. (");
         output.shouldContain("Entering safepoint region: ");