diff --git a/.travis.yml b/.travis.yml
index 84f68f4..1a25277 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,20 @@
 # This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
+
+
+language: python
+python:
+    - 3.5
+    - 3.6
+
+install: pip install -U tox-travis
+
+script: tox -e codecov
+
 deploy:
-  true:
-    python: 3.5
+  on:
     repo: webyneter/python-humble-utils
     tags: true
+    python: 2.7
   user: webyneter
   password:
     secure: !!binary |
@@ -21,10 +32,3 @@ deploy:
       c1lyTEZQV1JZV2ZiRGlzN2xCVktzTWcyUC9yOTBqOGlqN1g4RlFuak9kTHpTaFRvZktNbUJKcDA9
   provider: pypi
   distributions: sdist bdist_wheel
-install: pip install -U tox-travis
-language: python
-python:
-- 3.5
-script: tox -e codecov
-after_success:
-    - codecov
diff --git a/setup.py b/setup.py
index e5bc6bd..bb23b9c 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,7 @@
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     keywords=[
         'python',
diff --git a/tox.ini b/tox.ini
index 81ece73..9d4da76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-envlist = py35, flake8
+envlist = py35, py36, flake8
 
 [travis]
 python =
     3.5: py35
+    3.6: py36
 
 [testenv]
 setenv =