It looks like you lost a lot of the changes I made in my pull request. With the code you have here, users will have to have jcip-annotations in their classpath in order to use JUnit. I worked around that in my pull request.