Backport of gh-32820

Comment From: snicoll

Let's backport up to 6.0.x where the inputstream test was introduced.