diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index a611a1a..2336aec 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -217,6 +217,27 @@
         if (env.RUN_UPGRADE_AFTER_JOB == "true" && currentBuild.result == 'SUCCESS') {
             network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
             upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
+            upgrade_to_tag = ''
+            contrail_upgrade_line = ''
+            if(env.UPGRADE_TO_TAG == "true") {
+                upgrade_to_tag = '--update-to-tag ${env.UPGRADE_VERSION_TAG} '
+            }
+            if(env.PLATFORM_STACK_INSTALL.contains("contrail") {
+                contrail_upgrade_line = "tcp_tests/tests/system/test_upgrade_contrail.py::TestUpdateContrail "
+            }
+            run_test_opts = """--keep-duplicates --maxfail=1 \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain ${upgrade_to_tag} \
+                ${contrail_upgrade_line}\
+                tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera --update-mysql-version 5.7 \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
+                \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
+            """
             if (env.IPMI_CREDS) {
                 upgrade_job = "mcp-update-bm-b300-queens-ovs-maas"
             }
@@ -227,6 +248,7 @@
                     string(name: 'PASSED_STEPS', value: steps),
                     string(name: 'TEMPEST_TEST_SUITE_NAME', value: env.TEMPEST_TEST_SUITE_NAME),
                     string(name: 'NODE', value: "openstack_slave_${env.ENV_NAME}")
+                    string(name: 'RUN_TEST_OPTS', value: run_test_opts)
                 ],
                 wait: false,
                 propagate: false