Revert "Unskipped tests after ci upgrade (bug 860476)"

This reverts commit cff915445163f8c8a31f3facb574eaec4fe3ff38.