reduce duplication of skip conditions

git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/npanday-its/trunk@1571658 13f79535-47bb-0310-9956-ffa450edef68