diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..39ca5bf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+---
+sudo: required
+
+language: python
+python:
+  - "2.7"
+  - "3.6"
+
+install:
+  - pip install tox-travis
+
+script:
+  - tox
diff --git a/tox.ini b/tox.ini
index fd3144d..346173a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,9 @@ minversion = 1.8
 envlist =
     py{27,36}-unit
     py{27,36}-lint
+    format-check
     doc
+skipsdist = true
 
 [testenv]
 passenv = *
@@ -11,16 +13,20 @@ deps =
     -rrequirements.txt
     -rtest-requirements.txt
 commands =
-    unit: py.test -vv -x --cov={toxinidir}/giturlparse/ {posargs}
+    unit: py.test -vv
     lint: flake8
 
 [testenv:format]
 commands =
-    yapf -i -r giturlparse/ test/
+    yapf -i -r giturlparse// test/
+
+[testenv:format-check]
+commands =
+    yapf -d -r giturlparse/ test/
 
 [testenv:doc]
 passenv = *
 deps=
     -rdoc-requirements.txt
 commands=
-    python setup.py build_sphinx
+    python setup.py build_sphinx --builder=html