Fix tests broken from HORNETQ-1437
Merge pull request #1930 from jbertram/2.4.x

Fix tests broken from HORNETQ-1437