@nstraub's changes from skip-logic-tests in a single commit