diff --git a/.travis.yml b/.travis.yml
index 52edfbba4..bbd09ce87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,8 @@ before_install:
   - gimme ${GOLANG_VERSION}
   - source ~/.gimme/envs/go${GOLANG_VERSION}.env
   - mkdir -p $GOPATH/bin
+  # csi release to use for upgrade testing
+  - export UPGRADE_VERSION=$(source build.env ; echo ${UPGRADE_VERSION})
 
 before_script:
   - export CV=$(source build.env ; echo ${CEPH_VERSION})
@@ -143,6 +145,24 @@ jobs:
         - scripts/travis-helmtest.sh v1.18.5 --test-cephfs=false
           --test-rbd=true || travis_terminate 1;
 
+    - stage: upgrade testing
+      name: CephFS upgrade tesing with CSI v2.1.2
+      script:
+        - scripts/skip-doc-change.sh || travis_terminate 0;
+        - make image-cephcsi || travis_terminate 1;
+        - scripts/travis-functest.sh v1.18.5 --test-cephfs=true
+          --test-rbd=false --upgrade-testing=true
+          --upgrade-version="${UPGRADE_VERSION}" || travis_terminate 1;
+
+    - stage: upgrade testing
+      name: RBD upgrade tesing with CSI v2.1.2
+      script:
+        - scripts/skip-doc-change.sh || travis_terminate 0;
+        - make image-cephcsi || travis_terminate 1;
+        - scripts/travis-functest.sh v1.18.5 --test-cephfs=false
+          --test-rbd=true --upgrade-testing=true
+          --upgrade-version="${UPGRADE_VERSION}" || travis_terminate 1;
+
     - stage: deploy
       name: push artifacts to repositories
       script: ./deploy.sh
diff --git a/build.env b/build.env
index 0e66c22d9..70c3136ea 100644
--- a/build.env
+++ b/build.env
@@ -40,3 +40,4 @@ CHANGE_MINIKUBE_NONE_USER=true
 #CEPH_CSI_RUN_ALL_TESTS=true
 E2E_TIMEOUT=60m
 DEPLOY_TIMEOUT=10
+UPGRADE_VERSION=v2.1.2