--- a/langtools/test/tools/javac/lib/combo/ReusableContext.java	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/test/tools/javac/lib/combo/ReusableContext.java	Thu Mar 17 19:04:28 2016 +0000
@@ -112,7 +112,7 @@
         public Void visitClass(ClassTree node, Symtab syms) {
             Symbol sym = ((JCClassDecl)node).sym;
             if (sym != null) {
-                syms.classes.remove(sym.flatName());
+                syms.removeClass(sym.packge().modle, sym.flatName());
                 Type sup = supertype(sym);
                 if (isCoreClass(sym) ||
                         (sup != null && isCoreClass(sup.tsym) && sup.tsym.kind != Kinds.Kind.TYP)) {