diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..b2713c79
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,3 @@
+[run]
+parallel=True
+source=pgcli
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 99a2b75f..672b309a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,3 +3,4 @@ mock>=1.0.1
 tox>=1.9.2
 behave>=1.2.4
 pexpect==3.3
+coverage==4.3.4
\ No newline at end of file
diff --git a/tests/features/environment.py b/tests/features/environment.py
index da5c46d5..200eee7b 100644
--- a/tests/features/environment.py
+++ b/tests/features/environment.py
@@ -16,6 +16,7 @@ def before_all(context):
     os.environ['COLUMNS'] = "100"
     os.environ['PAGER'] = 'cat'
     os.environ['EDITOR'] = 'nano'
+    os.environ["COVERAGE_PROCESS_START"] = os.getcwd() + "/../.coveragerc"
 
     context.exit_sent = False
 
@@ -30,7 +31,10 @@ def before_all(context):
         'pass': context.config.userdata.get('pg_test_pass', None),
         'dbname': db_name_full,
         'dbname_tmp': db_name_full + '_tmp',
-        'vi': vi
+        'vi': vi,
+        'cli_command': context.config.userdata.get('pg_cli_command', None) or
+                       sys.executable +
+                       ' -c "import coverage; coverage.process_startup(); import pgcli.main; pgcli.main.cli()"'
     }
 
     # Store old env vars.
diff --git a/tests/features/steps/basic_commands.py b/tests/features/steps/basic_commands.py
index e52690c8..8200684e 100644
--- a/tests/features/steps/basic_commands.py
+++ b/tests/features/steps/basic_commands.py
@@ -17,7 +17,8 @@ def step_run_cli(context):
     """
     Run the process using pexpect.
     """
-    context.cli = pexpect.spawnu('pgcli')
+    cli_cmd = context.conf.get('cli_command')
+    context.cli = pexpect.spawnu(cli_cmd)
     context.exit_sent = False