Ensure backwards-compatibility of JUnit tests