diff --git a/CHANGES.rst b/CHANGES.rst
index e690b5b..3b05f7e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,9 @@ Bug fixes:
 - Allow defaults to be set on dexterity type fields via the web UI (@@fields)
   [ezvirtual]
 
+- Fix tests in py3 and some py3 issues.
+  [pbauer]
+
 
 2.0.19 (2018-02-02)
 -------------------
diff --git a/setup.py b/setup.py
index 067f12c..7cf34ec 100644
--- a/setup.py
+++ b/setup.py
@@ -16,8 +16,11 @@
         "Framework :: Plone",
         "Framework :: Plone :: 5.0",
         "Framework :: Plone :: 5.1",
+        "Framework :: Plone :: 5.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "License :: OSI Approved :: BSD License",
     ],