diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32bfbff..ce4cf6b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,42 +1,38 @@
 version: 2
 jobs:
-  test:
+  test-py2:
     docker:
-      - image: python:3.5
+      - image: python:2.7
     working_directory: ~/python-client
     steps:
       - checkout
 
       - run:
           command: pip install --upgrade pip tox
-      
+
       - run:
-          command: | 
+          command: |
             tox -e lint
-            tox -e py35
-  
-  pypi_upload:
+            tox -e py27
+
+  test-py3:
     docker:
-        - image: python:3.5
+      - image: python:3.7
+    working_directory: ~/python-client
     steps:
       - checkout
 
+      - run:
+          command: pip install --upgrade pip tox
+
       - run:
           command: |
-            pip install --upgrade pip tox
-            tox -e build_pypi
+            tox -e lint
+            tox -e py37
 
 workflows:
   version: 2
   test:
     jobs:
-      - test
-  pypi_upload:
-    jobs:
-      - pypi_upload:
-          filters:
-            tags:
-              only:
-                - /^[0-9]+.[0-9]+.[0-9]+$/
-            branches:
-              ignore: /.*/
\ No newline at end of file
+      - test-py2
+      - test-py3
\ No newline at end of file
diff --git a/requirements/prod.txt b/requirements/prod.txt
index 2c773fd..8d8fe3f 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -1,5 +1,5 @@
 elasticsearch>=2.0.0
-pymongo==3.7.2
+pymongo==3.8.0
 redis>=2.0
 requests>=2.0.0
 six<2.0
diff --git a/setup.py b/setup.py
index fca9571..2ebfc0f 100755
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-VERSION = ('0', '5', '2')
-__version__ = '.'.join(VERSION)
+__version__ = '0.6.0'
 
 with open('README.md') as f:
     readme = f.read()