--- a/langtools/test/tools/javac/ThrowsIntersection_1.java	Wed Mar 03 17:22:52 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_1.java	Wed Mar 03 19:34:34 2010 -0800
@@ -30,6 +30,8 @@
  * @compile ThrowsIntersection_1.java
  */
 
+package ThrowsIntersection_1;
+
 class Ex1 extends Exception {}
 class Ex2 extends Exception {}
 

--- a/langtools/test/tools/javac/ThrowsIntersection_2.java	Wed Mar 03 17:22:52 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_2.java	Wed Mar 03 19:34:34 2010 -0800
@@ -30,6 +30,8 @@
  * @compile ThrowsIntersection_2.java
  */
 
+package ThrowsIntersection_2;
+
 class Ex1 extends Exception {}
 class Ex2 extends Exception {}
 class Ex3 extends Exception {}

--- a/langtools/test/tools/javac/ThrowsIntersection_3.java	Wed Mar 03 17:22:52 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_3.java	Wed Mar 03 19:34:34 2010 -0800
@@ -30,6 +30,8 @@
  * @run compile/fail ThrowsIntersection_3.java
  */
 
+package ThrowsIntersection_3;
+
 class Ex1 extends Exception {}
 class Ex2 extends Exception {}
 

--- a/langtools/test/tools/javac/ThrowsIntersection_4.java	Wed Mar 03 17:22:52 2010 -0800
+++ b/langtools/test/tools/javac/ThrowsIntersection_4.java	Wed Mar 03 19:34:34 2010 -0800
@@ -30,6 +30,8 @@
  * @run compile/fail ThrowsIntersection_4.java
  */
 
+package ThrowsIntersection_4;
+
 // Note:  This is the test that actually failed for 4042259.  The others are for completeness.
 
 class Ex1 extends Exception {}

--- a/langtools/test/tools/javac/generics/NameOrder.java	Wed Mar 03 17:22:52 2010 -0800
+++ b/langtools/test/tools/javac/generics/NameOrder.java	Wed Mar 03 19:34:34 2010 -0800
@@ -27,7 +27,7 @@
  * @summary generics: type inference failure due to a bug in ClassSymbol.isLess
  * @author gafter
  *
- * @compile  NameOrder.java
+ * @compile NameOrder.java
  */
 
 package NameOrder;
@@ -36,13 +36,13 @@
 interface b {}
 interface c {}
 
-class A implements a, b {}
-class B implements c, a {}
+class AB implements a, b {}
+class CA implements c, a {}
 
 // this is how to trigger a symptom:
-abstract class C {
+abstract class X {
     <T> T f(T t1, T t2) { return null; }
     void g() {
-        a x = f( new A(), new B() );
+        a x = f( new AB(), new CA() );
     }
 }