Adapt test
Merge branch 'bug-18369-adapt-test'