diff --git a/Jenkinsfile b/Jenkinsfile
index 9408e8b24..3b0ff39f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,12 @@ pipeline {
         }
 
         stage("Test") {
+            when {
+                anyOf {
+                    branch '2.1.x'
+                    not { triggeredBy 'UpstreamCause' }
+                }
+            }
             parallel {
                 stage("test: baseline") {
                     agent {
@@ -68,6 +74,7 @@ pipeline {
         stage('Release to artifactory') {
             when {
                 branch 'issue/*'
+                not { triggeredBy 'UpstreamCause' }
             }
             agent {
                 docker {