Fix test suite failure on GCC 4.8, take two