Also fix the test compilation on Java 6