I already pushed a change into gaia_test to do it