Test against both 2.0 and 2.1