GROOVY-6081: Improve unit tests execution time (Part 2)

https://jira.codehaus.org/browse/GROOVY-6081