Fix tests on 5.4 (never thought I had to write that)