s3: try to make 'make selftest' work again