diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7823778
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.coverprofile
diff --git a/.travis.yml b/.travis.yml
index 76f38a4..b117165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: go
+
 sudo: false
 
 go:
@@ -8,16 +9,16 @@ go:
 - 1.4
 - 1.5.4
 - 1.6.2
-- tip
+- master
 
 matrix:
   allow_failures:
-    - go: tip
+  - go: master
 
 before_script:
 - go get github.com/meatballhat/gfmxr/...
 
 script:
-- go vet ./...
-- go test -v ./...
-- gfmxr -c $(grep -c 'package main' README.md) -s README.md
+- ./runtests vet
+- ./runtests test
+- ./runtests gfmxr
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f623e59..7416fe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - `context.GlobalBoolT` was added as an analogue to `context.GlobalBool`
 - Support for hiding commands by setting `Hidden: true` -- this will hide the
   commands in help output
+- `./runtests` test runner with coverage tracking by default
 
 ### Changed
 - `Float64Flag`, `IntFlag`, and `DurationFlag` default values are no longer
diff --git a/runtests b/runtests
new file mode 100755
index 0000000..162e23e
--- /dev/null
+++ b/runtests
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+from __future__ import print_function
+
+import os
+import sys
+import tempfile
+
+from subprocess import check_call, check_output
+
+
+PACKAGE_NAME = os.environ.get(
+    'CLI_PACKAGE_NAME', 'github.com/codegangsta/cli'
+)
+
+
+def main(sysargs=sys.argv[:]):
+    target = 'test'
+    if len(sysargs) > 1:
+        target = sysargs[1]
+
+    {
+        'vet': _vet,
+        'test': _test,
+        'gfmxr': _gfmxr
+    }[target]()
+
+    return 0
+
+
+def _test():
+    if check_output('go version'.split()).split()[2] < 'go1.2':
+        _run('go test -v ./...'.split())
+        return
+
+    coverprofiles = []
+    for subpackage in ['', 'altsrc']:
+        coverprofile = 'cli.coverprofile'
+        if subpackage != '':
+            coverprofile = '{}.coverprofile'.format(subpackage)
+
+        coverprofiles.append(coverprofile)
+
+        _run('go test -v'.split() + [
+            '-coverprofile={}'.format(coverprofile),
+            ('{}/{}'.format(PACKAGE_NAME, subpackage)).rstrip('/')
+        ])
+
+    combined = _combine_coverprofiles(coverprofiles)
+    _run('go tool cover -func={}'.format(combined.name).split())
+    combined.close()
+
+
+def _gfmxr():
+    _run(['gfmxr', '-c', str(_gfmxr_count()), '-s', 'README.md'])
+
+
+def _vet():
+    _run('go vet ./...'.split())
+
+
+def _run(command):
+    print('runtests: {}'.format(' '.join(command)), file=sys.stderr)
+    check_call(command)
+
+
+def _gfmxr_count():
+    with open('README.md') as infile:
+        lines = infile.read().splitlines()
+        return len(filter(_is_go_runnable, lines))
+
+
+def _is_go_runnable(line):
+    return line.startswith('package main')
+
+
+def _combine_coverprofiles(coverprofiles):
+    combined = tempfile.NamedTemporaryFile(suffix='.coverprofile')
+    combined.write('mode: set\n')
+
+    for coverprofile in coverprofiles:
+        with open(coverprofile, 'r') as infile:
+            for line in infile.readlines():
+                if not line.startswith('mode: '):
+                    combined.write(line)
+
+    combined.flush()
+    return combined
+
+
+if __name__ == '__main__':
+    sys.exit(main())