JBIDE-14472 using upstream mechanism, fix tests