Make test stable again

Change-Id: I1e02ce31ec7f0235158a5b04812c031e040c7ba2