Fixed flakey test [Delivers #66267014]

Signed-off-by: Tammer Saleh <tammer@pivotallabs.com>