The fix for 6505047 "javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter" was intended to change the specification of TypeElement.getEnclosingElement to return the generic element rather than null. That specification change was inadvertently not included with the push of tests to verify the new specification. The specification should be changed accordingly.