diff --git a/.travis.yml b/.travis.yml
index 52bf812d..eb1666d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ jobs:
         - docker run --rm -it mongodb_consistent_backup:latest --version
         - mkdir -p $TRAVIS_BUILD_DIR/docker
         - docker save mongodb_consistent_backup:latest >$TRAVIS_BUILD_DIR/docker/mongodb_consistent_backup.tar
+    - stage: test-replset-3.6
+      script:
+        - docker load -i $TRAVIS_BUILD_DIR/docker/mongodb_consistent_backup.tar
+        - $TRAVIS_BUILD_DIR/scripts/travis-ci/run-replset.sh 3.6
     - stage: test-cluster-3.4
       script:
         - docker load -i $TRAVIS_BUILD_DIR/docker/mongodb_consistent_backup.tar
diff --git a/Dockerfile b/Dockerfile
index 2fbfcb18..ac9ef614 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM centos:centos7
 MAINTAINER Tim Vaillancourt <tim.vaillancourt@percona.com>
 
-RUN yum install -y https://www.percona.com/redir/downloads/percona-release/redhat/latest/percona-release-0.1-6.noarch.rpm epel-release && \
-	yum install -y Percona-Server-MongoDB-34-tools zbackup && yum clean all
+RUN yum install -y https://www.percona.com/redir/downloads/percona-release/redhat/latest/percona-release-0.1-6.noarch.rpm && \
+	yum install -y Percona-Server-MongoDB-36-tools zbackup && yum clean all
 
 ADD build/rpm/RPMS/x86_64/mongodb_consistent_backup*.el7.x86_64.rpm /
 RUN yum localinstall -y /mongodb_consistent_backup*.el7.x86_64.rpm && \