diff --git a/.travis.yml b/.travis.yml
index f07d49e..c5c2fe9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,10 @@
+install: pip install -U tox
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.3"
-install: "python setup.py develop"
-script: "python setup.py test"
+python: 
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+script: tox -e py${TRAVIS_PYTHON_VERSION//./}
diff --git a/README.md b/README.md
index bf55f25..9dec62d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
 # SECRETARY
 
+                                                                                                                  
+<a href="https://pypi.python.org/pypi/secretary">
+<img src="https://img.shields.io/pypi/v/secretary.svg">
+</a>
+<a href="https://travis-ci.org/christopher-ramirez/secretary">
+<img src="https://img.shields.io/travis/christopher-ramirez/secretary.svg">
+</a>
+
 #### Take the power of Jinja2 templates to OpenOffice and LibreOffice and create reports in your web applications.
 
 
diff --git a/tox.ini b/tox.ini
index 6fb3487..6f64342 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py3, py33, py34
+envlist = py26, py27, py3, py33, py34, py35, py36
 
 [testenv]
 deps = pytest