Fix for broken e2e tests.