--- old/test/runtime/logging/SafepointCleanupTest.java	2017-07-12 15:25:47.006928344 +0200
+++ new/test/runtime/logging/SafepointCleanupTest.java	2017-07-12 15:25:46.949929345 +0200
@@ -38,10 +38,10 @@
     static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("[safepoint,cleanup]");
+        output.shouldContain("safepoint cleanup tasks");
         output.shouldContain("deflating idle monitors");
         output.shouldContain("updating inline caches");
         output.shouldContain("compilation policy safepoint handler");
-        output.shouldContain("mark nmethods");
         output.shouldContain("purging class loader data graph");
         output.shouldHaveExitValue(0);
     }