[PATCH v3 14/15] tools: post test-runner rewrite cleanup