Improved hack for gaiatest.