make tests findable in both 1.6 and 1.5