Figure out the test_name before using it (significant only to Travis skips)
Turn the Travis CI test skipping mechanism into something more generic
Merge pull request #667 from Rosuav/testfixes

A couple of small fixes to run-tests