Merge pull request #1933 from dj2/runtest

Make runtests configurable.