Add this change to CD_testsuite as well. ;-)