Experimental fix for WebUI tests

Change-Id: Ieee3ef95f2c2dbf68bd4f74589856407ee3b54c1