JBIDE-13973 - Test failures in Kepler >= M6

https://issues.jboss.org/browse/JBIDE-13973
Test failures in Kepler >= M6