My first comment seemed to be hard to figure out: Why don't you annotate the cleanup method with @Before *and* @After directly? This gets us rid of the boilerplate here.