Make test more strict

PR #1538 was made in an attempt to get PR #1536 to pass. That was a mistake, as
PR #1536 is broken.

Revert ea7c20d3983507b655cd8d6e9e77461a1b0d32da