diff -r c49bdfeb5941 -r ca8fef4cd57b hotspot/test/gc/startup_warnings/TestParNewCMS.java
--- a/hotspot/test/gc/startup_warnings/TestParNewCMS.java	Mon Sep 21 10:45:41 2015 +0200
+++ b/hotspot/test/gc/startup_warnings/TestParNewCMS.java	Fri Sep 11 15:31:03 2015 -0400
@@ -40,7 +40,7 @@
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldContain("warning: The UseParNewGC flag is deprecated and will likely be removed in a future release");
+    output.shouldContain("warning: Option UseParNewGC was deprecated in version");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }