Temporary fix for remote tests