--- a/langtools/test/tools/javac/Diagnostics/7010608/Test.java	Tue Jul 26 15:52:51 2016 +0200
+++ b/langtools/test/tools/javac/Diagnostics/7010608/Test.java	Tue Jul 26 07:45:29 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -46,9 +46,9 @@
         try {
             test(Arrays.<String>asList(),
                     "myfo://test:1: error: cannot find symbol");
-            test(Arrays.asList("-XDdiagsFormat=OLD"),
+            test(Arrays.asList("-diags:layout=OLD"),
                     "myfo://test:1: cannot find symbol");
-            test(Arrays.asList("-XDoldDiags"),
+            test(Arrays.asList("-diags:legacy"),
                     "myfo://test:1: cannot find symbol");
         } finally {
             Locale.setDefault(prev);