Workaround for Varnish issue #2880:
https://github.com/varnishcache/varnish-cache/issues/2880

Refactor the test sources a bit while we're here.