Does this work? I have a vague memory that rackspace and aws needed different: one was "image-name-matches", and the other "image-description-matches" or some such.

What do you think of AbstractEc2LiveTest? Would it be hard to extend that instead? I'm fine with you not, but would useful to know how easily we can be consistent and whether forcing folk to extend the abstract test is ok in general.