Fix for test to work with bluegene. The underlying code is still broken

though we decided to push that fix to 16.05 since this has been broken for
a while and no one has complained.