Fix for 1.8.7 spec tests

Prior to this commit we did not run our spec tests on 1.8.7