JBIDE-15328 - Fixing Arquillian tests