GRECLIPSE-1780 Add conditionals to some tests