diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000000000..812fc3b139483c
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,4 @@
+[report]
+omit =
+    */python?.?/*
+    */site-packages/nose/*
diff --git a/.gitignore b/.gitignore
index 5fe1d994e3c43e..5d3970a168353d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ deb-build
 credentials.yml
 # test output
 .coverage
+.tox
 results.xml
 coverage.xml
 /test/units/cover-html
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000000..6e18e06050cd88
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+sudo: false
+language: python
+env:
+  - TOXENV=py26
+  - TOXENV=py27
+install:
+  - pip install tox
+script:
+  - tox
+after_success:
+  - coveralls
diff --git a/Makefile b/Makefile
index f688bd73bf607b..81e24efab367d5 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ NOSETESTS3 ?= nosetests-3.3
 all: clean python
 
 tests:
-	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v # Could do: --with-coverage --cover-package=ansible
+	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches
 
 newtests:
 	PYTHONPATH=./v2:./lib $(NOSETESTS) -d -w v2/test -v --with-coverage --cover-package=ansible --cover-branches
diff --git a/README.md b/README.md
index 8bfe58a5433377..e052e78dcde29e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-[![PyPI version](https://badge.fury.io/py/ansible.png)](http://badge.fury.io/py/ansible) [![PyPI downloads](https://pypip.in/d/ansible/badge.png)](https://pypi.python.org/pypi/ansible)
+[![PyPI version](https://badge.fury.io/py/ansible.png)](http://badge.fury.io/py/ansible)
+[![PyPI downloads](https://pypip.in/d/ansible/badge.png)](https://pypi.python.org/pypi/ansible)
+[![Build Status](https://travis-ci.org/ansible/ansible.svg?branch=tox_and_travis)](https://travis-ci.org/ansible/ansible)
 
 
 Ansible
diff --git a/test-requirements.txt b/test-requirements.txt
index 714b65b7646146..abb61ed1e97c1d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,3 +5,5 @@
 nose
 mock
 passlib
+coverage
+coveralls
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000000000..7c86e7e08f1ff4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py26,py27
+
+[testenv]
+deps = -r{toxinidir}/test-requirements.txt
+whitelist_externals = make
+commands = make tests