Merge pull request #32896 from alexcrichton/stable-next

Fix a test on stable