[1.7.x] Fixed stable/1.7.x test failures from refs #23699.