Support unit test for #6897