JBIDE-17341: make two failing tests pass again