diff -r 843d3b191773 -r 01c9d4161882 test/tools/javac/conditional/Conditional.java
--- a/test/tools/javac/conditional/Conditional.java	Fri Nov 16 18:27:36 2012 +0000
+++ b/test/tools/javac/conditional/Conditional.java	Sat Nov 17 19:01:03 2012 +0000
@@ -27,8 +27,8 @@
  * @summary Conditional operator applies assignment conversion
  * @author Tim Hanson, BEA
  *
- * @compile -XDallowPoly Conditional.java
- * @compile/fail Conditional.java
+ * @compile Conditional.java
+ * @compile/fail -source 7 Conditional.java
  */
 
 import java.util.*;