There are not many tests using EasyMock - maybe we should think about converting them to Mockito and removing the EM dep ? (Different JIRA, though).