Makes client integration tests work again