diff --git a/.ci/.matrix_framework_full.yml b/.ci/.matrix_framework_full.yml
index d2482d9ff..8cd63d48d 100644
--- a/.ci/.matrix_framework_full.yml
+++ b/.ci/.matrix_framework_full.yml
@@ -46,6 +46,7 @@ FRAMEWORK:
   - pymongo-3.3
   - pymongo-3.4
   - pymongo-3.5
+  - pymongo-3.6
   - pymongo-newest
   - redis-3
   - redis-2
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 62a05c83f..c6598a969 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -46,6 +46,13 @@ services:
     volumes:
       - pymongodata36:/data/db
 
+  mongodb40:
+    image: mongo:4.0
+    ports:
+      - "27017:27017"
+    volumes:
+      - pymongodata40:/data/db
+
   memcached:
     image: memcached
 
@@ -198,6 +205,8 @@ volumes:
     driver: local
   pymongodata36:
     driver: local
+  pymongodata40:
+    driver: local
   pyesdata7:
     driver: local
   pyesdata8:
diff --git a/tests/scripts/envs/pymongo-3.6.sh b/tests/scripts/envs/pymongo-3.6.sh
new file mode 100644
index 000000000..4454a674f
--- /dev/null
+++ b/tests/scripts/envs/pymongo-3.6.sh
@@ -0,0 +1,3 @@
+export PYTEST_MARKER="-m mongodb"
+export DOCKER_DEPS="mongodb36"
+export MONGODB_HOST="mongodb36"
diff --git a/tests/scripts/envs/pymongo-newest.sh b/tests/scripts/envs/pymongo-newest.sh
index 4454a674f..d1766b69f 100644
--- a/tests/scripts/envs/pymongo-newest.sh
+++ b/tests/scripts/envs/pymongo-newest.sh
@@ -1,3 +1,3 @@
 export PYTEST_MARKER="-m mongodb"
-export DOCKER_DEPS="mongodb36"
-export MONGODB_HOST="mongodb36"
+export DOCKER_DEPS="mongodb40"
+export MONGODB_HOST="mongodb40"