diff --git a/setup.cfg b/setup.cfg
index e359f2ee..04fe944e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,8 +12,9 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages = openstack_election
diff --git a/tox.ini b/tox.ini
index 16e942cf..9bfd785a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ minversion = 2.0
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
@@ -25,10 +26,6 @@ commands = {posargs}
 basepython = python2
 commands = {posargs}
 
-[testenv:venv3]
-basepython = python3
-commands = {posargs}
-
 [testenv:docs]
 commands = python setup.py build_sphinx