diff --git a/.zuul.yaml b/.zuul.yaml
index 3e60c8bc48..5404d1ad65 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -807,7 +807,8 @@
         - devstack-multinode
         - devstack-unit-tests
         - openstack-tox-bashate
-        - ironic-tempest-bios-ipmi-direct-tinyipa
+        - ironic-tempest-bios-ipmi-direct-tinyipa:
+            voting: false
         - swift-dsvm-functional
         - grenade:
             irrelevant-files:
@@ -865,7 +866,10 @@
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
-        - ironic-tempest-bios-ipmi-direct-tinyipa
+        # TODO(ykarel): ironic-tempest job is broken in this branch,
+        # so it is set as non-voting in check queue and commented out here
+        # in gate queue until the job gets fixed.
+        # - ironic-tempest-bios-ipmi-direct-tinyipa
         - swift-dsvm-functional
         - grenade:
             irrelevant-files:
diff --git a/stackrc b/stackrc
index 6c92f0ed60..16cf3ce955 100644
--- a/stackrc
+++ b/stackrc
@@ -300,8 +300,8 @@ REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-$TARGET_BRANCH}
 
 # Tempest test suite
 TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
-TEMPEST_BRANCH=${TEMPEST_BRANCH:-$BRANCHLESS_TARGET_BRANCH}
-TEMPEST_VENV_UPPER_CONSTRAINTS=${TEMPEST_VENV_UPPER_CONSTRAINTS:-master}
+TEMPEST_BRANCH=${TEMPEST_BRANCH:-41.0.0 }
+TEMPEST_VENV_UPPER_CONSTRAINTS=${TEMPEST_VENV_UPPER_CONSTRAINTS:-$REQUIREMENTS_DIR/upper-constraints.txt}
 
 
 ##############
diff --git a/tests/test_refs.sh b/tests/test_refs.sh
index 0f9aa4a5ca..d9b328294a 100755
--- a/tests/test_refs.sh
+++ b/tests/test_refs.sh
@@ -15,7 +15,7 @@
 
 echo "Ensuring we don't have crazy refs"
 
-REFS=`grep BRANCH stackrc | grep -v 'TARGET_BRANCH' | grep -v 'NOVNC_BRANCH'`
+REFS=`grep BRANCH stackrc | grep -v 'TARGET_BRANCH' | grep -v 'NOVNC_BRANCH' | grep -v 'TEMPEST_BRANCH'`
 rc=$?
 if [[ $rc -eq 0 ]]; then
     echo "Branch defaults must be one of the *TARGET_BRANCH values. Found:"