Backed out changeset b97a4451fc30 (bug 841341) because apparently changing the order of the tests causes others to fail.