Proper fix for CI tests.