Fix the flavor tests failing under py33

Change-Id: Ia2d6c11ec6319c2c81551ae4ba01bfdc59df3490
Closes-Bug: #1363128
Merge "Fix the flavor tests failing under py33"