Upgrade to PowerMock 2