Merge pull request #3112 from akoeplinger/test-runner-nofile