Converted to JUnit 4 and added timeouts.  See AMQ-5013