Temporary fix for server test suite.