Previously, the test could pass with one part of c3b1d730 removed. (cherry picked from commit 8dc82039)