make run-tools-tests pass for a brief while