Make the test introduced in r239015 more targeted.