diff --git a/.travis.yml b/.travis.yml
index 28d45054..54a6befd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,10 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_6=3.6
+    - PYMONGO_3_4=3.4
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=3.x
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
 
 matrix:
 
@@ -42,9 +44,9 @@ matrix:
 
   include:
   - python: 2.7
-    env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
+    env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
 
 
 install:
@@ -105,5 +107,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4.17)
+    condition: ($PYMONGO = ${PYMONGO_3_6}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7
diff --git a/tox.ini b/tox.ini
index 40bcea8a..a1ae8444 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg35,mg3x}
+envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
 
 [testenv]
 commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    mg34x: PyMongo>=3.4,<3.5
-    mg3x: PyMongo>=3.0,<3.7
+    mg34: pymongo>=3.4,<3.5
+    mg36: pymongo>=3.6,<3.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs