diff --git a/.travis.yml b/.travis.yml
index 453fa92..cd0cdfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 before_install:
   - "sudo apt-get -q update"
   - "pip install -U pip"
diff --git a/setup.py b/setup.py
index d49bfe7..b13ede0 100755
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ setup(name="hddfancontrol",
                    "Programming Language :: Python :: 3.3",
                    "Programming Language :: Python :: 3.4",
                    "Programming Language :: Python :: 3.5",
+                   "Programming Language :: Python :: 3.6",
                    "Topic :: System :: Hardware",
                    "Topic :: System :: Monitoring",
                    "Topic :: Utilities"])