diff --git a/setup.py b/setup.py
index 6c9ff1b..aa662c9 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@
         'License :: OSI Approved :: Zope Public License',
         'Framework :: Buildout',
         'Framework :: Plone',
+        'Framework :: Plone :: 5.1',
         'Framework :: Plone :: 5.2',
         'Framework :: Zope',
         'Framework :: Zope :: 4',
diff --git a/tox.ini b/tox.ini
index e316814..ecdf9bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ commands =
     coverage report --fail-under=62
 
 [testenv:flake8]
-basepython = python2.7
+basepython = python3.6
 skip_install = true
 deps = flake8
 commands = flake8 --doctests src setup.py