Issue #2235111 by tstoeckler: EntityQueryTest is fragile.