diff --git a/defaults/main.yml b/defaults/main.yml
index 15402573..5b159fa5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,6 +21,8 @@ debug: False
 tempest_package_state: "latest"
 tempest_pip_package_state: "latest"
 
+tempest_upper_constraints_url: "https://opendev.org/openstack/requirements/raw/{{ requirements_git_install_branch | default('master') }}/upper-constraints.txt"
+
 # Set the host which will execute the shade modules
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
diff --git a/tasks/tempest_install.yml b/tasks/tempest_install.yml
index 9524e0b4..6b6a9a03 100644
--- a/tasks/tempest_install.yml
+++ b/tasks/tempest_install.yml
@@ -83,7 +83,7 @@
     virtualenv_site_packages: "no"
     extra_args: >-
       {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
-      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      --constraint {{ tempest_upper_constraints_url }}
       {{ pip_install_options | default('') }}
   register: install_packages
   until: install_packages is success
@@ -147,7 +147,7 @@
     virtualenv_site_packages: "no"
     extra_args: >-
       {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
-      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      --constraint {{ tempest_upper_constraints_url }}
       {{ pip_install_options | default('') }}
       --isolated
   with_items: "{{ _test_requirements_stat.results }}"
@@ -168,7 +168,7 @@
     virtualenv_site_packages: "no"
     extra_args: >-
       {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
-      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      --constraint {{ tempest_upper_constraints_url }}
       {{ pip_install_options | default('') }}
       --isolated
   with_items: "{{ tempest_plugins }}"
@@ -186,7 +186,7 @@
     virtualenv_site_packages: "no"
     extra_args: >-
       {{ tempest_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
-      {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+      --constraint {{ tempest_upper_constraints_url }}
       {{ pip_install_options | default('') }}
       --isolated
   with_items: "{{ tempest_plugins }}"