diff --git a/.travis.yml b/.travis.yml
index 7dbad3a..f51d22c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,6 @@ matrix:
       env: DJANGO=1.8.1 COVERAGE="coverage run -m" TEST_K="not ddns_client" TEST_OPTS="--pep8"
     - python: "3.6"
       env: DJANGO=1.8.17
-  allow_failures:
-    - python: "3.6"
 
 install:
     - ./scripts/travis/install.sh
diff --git a/setup.py b/setup.py
index 9e68207..b98db06 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: Name Service (DNS)',
     ],
 )