[WFLY-3348] Avoid spurious failures

The main fix for this JIRA is https://github.com/wildfly/wildfly-core/pull/72