workging around http://youtrack.jetbrains.com/issue/IDEA-106594
This doesn't affect any semantics on tests or code...
This helps us when developing on this branch, especially when writing and debugging tests.
Merge pull request #1655 from clebertsuconic/2.3.x.fix

workging around http://youtrack.jetbrains.com/issue/IDEA-106594 and adding test