diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..698302a
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,24 @@
+# This configuration file is used for manual execution of coverage
+# as well as for tests run through ansible-test.
+
+[run]
+branch = True
+
+# Enable concurrency. This also enables parallel mode, which results in
+# multiple coverage files being created. Concurrency allows us to collect
+# results from multiple tests simultaneously, as well as supporting multiple
+# test runs, such as from integration tests.
+concurrency = multiprocessing
+parallel = True
+
+# When running tests through ansible-test, this option is overridden by
+# the COVERAGE_FILE environment variable. This option is present for
+# convenience when running coverage manually from this directory.
+data_file = test/results/coverage/coverage
+
+# Don't collect or report code coverage from files matching these patterns.
+omit =
+    */python*/dist-packages/*
+    */python*/site-packages/*
+    */python*/distutils
+    */pytest
diff --git a/ansible-2.1.0.0-control_path.patch b/ansible-2.1.0.0-control_path.patch
deleted file mode 100644
index 7183dd3..0000000
--- a/ansible-2.1.0.0-control_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur ansible-2.1.0.0.orig/examples/ansible.cfg ansible-2.1.0.0/examples/ansible.cfg
---- ansible-2.1.0.0.orig/examples/ansible.cfg	2016-05-25 07:00:55.000000000 -0600
-+++ ansible-2.1.0.0/examples/ansible.cfg	2016-05-25 08:58:31.768143613 -0600
-@@ -286,6 +286,7 @@
- # Example:
- # control_path = %(directory)s/%%h-%%r
- #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
-+control_path = %(directory)s/ansible-ssh-%%C
- 
- # Enabling pipelining reduces the number of SSH operations required to
- # execute a module on the remote server. This can result in a significant