Fix issue introduced in recent test fix
Merge pull request #1778 from jbertram/master

Fix issue introduced in recent test fix