Make mixed domain tests compile again
Merge pull request #6473 from ctomc/testsuite-fix

Make mixed domain tests compile again