Fix a problem with --skip-self-test