diff --git a/.drone.yml b/.drone.yml
index 6f8f1deacc..e0bc2f7026 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,12 +31,6 @@ matrix:
         - IMAGE: python:2.7
           TOXENV: py27
           DATABASE: postgresql
-        - IMAGE: python:3.3
-          TOXENV: py33
-          DATABASE: sqlite
-        - IMAGE: python:3.3
-          TOXENV: py33
-          DATABASE: postgresql
         - IMAGE: python:3.4
           TOXENV: py34
           DATABASE: sqlite
@@ -49,3 +43,9 @@ matrix:
         - IMAGE: python:3.5
           TOXENV: py35
           DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff --git a/setup.py b/setup.py
index 49fa11b461..e8fdd26dec 100644
--- a/setup.py
+++ b/setup.py
@@ -107,9 +107,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff --git a/tox.ini b/tox.ini
index 08e43cf13a..527d85998d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-    {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5
+    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
     pypy-postgresql: psycopg2cffi >= 2.5
     mysql: MySQL-python
     sqlite: sqlitebck