diff --git a/setup.py b/setup.py
index dedbfa2..6dbf5ad 100644
--- a/setup.py
+++ b/setup.py
@@ -76,6 +76,7 @@ def _get_version():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     packages=['hl7apy', 'hl7apy.v2_2', 'hl7apy.v2_3', 'hl7apy.v2_3_1', 'hl7apy.v2_4',
               'hl7apy.v2_5', 'hl7apy.v2_5_1', 'hl7apy.v2_6'],
diff --git a/tox.ini b/tox.ini
index 94ca5f9..9d5fbfe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35
+envlist = py27,py34,py35,py36
 
 [testenv]
 deps=