diff --git a/.travis.yml b/.travis.yml
index fec2046e3bd40918d915521220358ccf0c7bebe9..bbb1f2d4d2c78c6ed42e85816e3ceeb466b0e53c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,10 @@ language: python
 python:
  - "2.7"
  - "3.5"
+ - "3.6"
+ - "3.7"
  - "pypy"
+ - "pypy3.5"
 script:
  - python compile_definitions.py
  - python setup.py nosetests
@@ -16,4 +19,4 @@ services: rabbitmq
 addons:
   apt:
     packages:
-      - rabbitmq-server
\ No newline at end of file
+      - rabbitmq-server
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 180b8e8f0518a24c895c33ee2c4296f96efdd815..d1c5035a8fe3bb0bfe1aa46523f2f339ee8ca37b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 * v0.96:
 
-* _TBA_
+* Python 3.6 and 3.7 officially supported and tested against. Also same done for PyPY 3.5
 
 * v0.95:
 
diff --git a/setup.cfg b/setup.cfg
index 835b2ab4c1f40bd5eb2a6b9b5690636f8a298afe..3de7e5cf2e67c35e938999ab0fe49a7029043867 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,8 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Operating System :: POSIX :: Linux