diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml
index abfb8b4746..d77e686b4c 100644
--- a/playbooks/defaults/repo_packages/openstack_testing.yml
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@@ -25,13 +25,6 @@
 ##     package should be one long name with no additional `_` separating it.
 
 
-## Tempest service
-tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: cad11526e3f5175722c26c4bae90f4357da9a067 # HEAD of "master" as of 31.03.2018
-tempest_git_project_group: utility_all
-tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True"
-
-
 ## Rally service
 rally_git_repo: https://git.openstack.org/openstack/rally
 rally_git_install_branch: 4c687b50d97841f131c9f375d708e3fb59e6915e # HEAD of "master" as of 31.03.2018
diff --git a/releasenotes/notes/build-tempest-with-constraints-409eab81862db701.yaml b/releasenotes/notes/build-tempest-with-constraints-409eab81862db701.yaml
new file mode 100644
index 0000000000..54b00f7597
--- /dev/null
+++ b/releasenotes/notes/build-tempest-with-constraints-409eab81862db701.yaml
@@ -0,0 +1,11 @@
+---
+features:
+  - When `venvwithindex=True` and `ignorerequirements=True` are both specified
+    in `tempest_git_install_fragments` (as was previously the default), this
+    results in tempest being installed from PyPI without any constraints being
+    applied. This could result in the version of tempest being installed in the
+    integrated build being different than the version being installed in the
+    independent role tests. Going forward, we remove the `tempest_git_*`
+    overrides in playbooks/defaults/repo_packages/openstack_testing.yml so that
+    the integrated build installs tempest from PyPI, but with appropriate
+    constraints applied.