s390x will define both s390x and s390, so exec-personality-s390.service is ran in both cases but fails on s390x, as the personality returned is s390x. Split the test and check specifically for s390x.
