Merge pull request #2512 from ludovic-henry/fix-coop-test-runtime