Fixes #1487.

Make use of no_stdin test option, introduced explictly for this purpose
in fa52a8c9d8eae5e3fc4c0cf0e5672875e161e05c