JBIDE-17515 - Fix broken tests :-/