kafka-1337 followup to fix system tests