Attempt to fix test failure
Merge pull request #1832 from elzj/queue_changes

Attempt to fix test failure