diff --git a/pytest_watch/command.py b/pytest_watch/command.py
index 0cd472f..19eaad5 100644
--- a/pytest_watch/command.py
+++ b/pytest_watch/command.py
@@ -16,11 +16,12 @@
                         (if relative, starts from root of each watched dir).
   -c --clear            Automatically clear the screen before each run.
   --beforerun=<cmd>     Run arbitrary command before tests are run.
+  --afterrun <cmd>      Run arbitrary command on completion or interruption.
+                        The exit code of "py.test" is passed as an argument.
   --onpass=<cmd>        Run arbitrary command on pass.
   --onfail=<cmd>        Run arbitrary command on failure.
-  --onexit=<cmd>        Run arbitrary command when exiting.
-  --oninterrupt=<cmd>   Run arbitrary command on KeyboardInterrupt.
-  --runner=<cmd>        Run a custom command instead of py.test.
+  --onexit=<cmd>        Run arbitrary command when exiting pytest-watch.
+  --runner=<cmd>        Run a custom command instead of "py.test".
   --pdb                 Start the interactive Python debugger on errors.
                         This also enables --wait to prevent pdb interruption.
   --nobeep              Do not beep on failure.
@@ -105,8 +106,8 @@ def main(argv=None):
                  onfail=args['--onfail'],
                  runner=args['--runner'],
                  beforerun=args['--beforerun'],
+                 afterrun=args['--afterrun'],
                  onexit=args['--onexit'],
-                 oninterrupt=args['--oninterrupt'],
                  poll=args['--poll'],
                  extensions=extensions,
                  args=pytest_args,
diff --git a/pytest_watch/watcher.py b/pytest_watch/watcher.py
index 16d147f..b8fabd0 100644
--- a/pytest_watch/watcher.py
+++ b/pytest_watch/watcher.py
@@ -45,7 +45,6 @@
 # Exit codes from pytest
 # http://pytest.org/latest/_modules/_pytest/main.html
 EXIT_OK = 0
-EXIT_INTERRUPTED = 2
 EXIT_NOTESTSCOLLECTED = 5
 
 
@@ -170,17 +169,18 @@ def _split_recursive(directories, ignore):
     return sorted(set(recursedirs)), sorted(set(norecursedirs))
 
 
-def run_hook(cmd):
+def run_hook(cmd, *args):
     """
     Runs a command hook, if specified.
     """
     if cmd:
-        os.system(cmd)
+        command = ' '.join(map(str, (cmd,) + args))
+        subprocess.call(command, shell=True)
 
 
 def watch(directories=[], ignore=[], auto_clear=False, beep_on_failure=True,
-          onpass=None, onfail=None, runner=None, beforerun=None, onexit=None,
-          oninterrupt=None, poll=False, extensions=[], args=[], spool=None,
+          onpass=None, onfail=None, runner=None, beforerun=None, afterrun=None,
+          onexit=None, poll=False, extensions=[], args=[], spool=None,
           wait=False, verbose=False, quiet=False):
     argv = (runner or 'py.test').split(' ') + (args or [])
 
@@ -237,15 +237,15 @@ def watch(directories=[], ignore=[], auto_clear=False, beep_on_failure=True,
                     sleep(0.1)
             except KeyboardInterrupt:
                 # Wait for current test run cleanup
-                if p.wait() == EXIT_INTERRUPTED:
-                    run_hook(oninterrupt)
+                run_hook(afterrun, p.wait())
                 # Exit, since this keyboard interrupt was user-initiated
                 break
 
-            # Run custom commands
-            if exit_code == EXIT_INTERRUPTED:
-                run_hook(oninterrupt)
-            elif exit_code in [EXIT_OK, EXIT_NOTESTSCOLLECTED]:
+            # Run custom command
+            run_hook(afterrun, exit_code)
+
+            # Run dependent commands
+            if exit_code in [EXIT_OK, EXIT_NOTESTSCOLLECTED]:
                 run_hook(onpass)
             else:
                 if beep_on_failure: