Fix issue 597 -- JUnit 3 style