diff --git a/playbooks/inventory/group_vars/repo_all.yml b/playbooks/inventory/group_vars/repo_all.yml
index 093a335859..51b8e50be1 100644
--- a/playbooks/inventory/group_vars/repo_all.yml
+++ b/playbooks/inventory/group_vars/repo_all.yml
@@ -45,3 +45,12 @@ repo_build_service_group_name: "{{ repo_service_group_name }}"
 
 # Disable the pip lock down for the repo servers
 pip_lock_to_internal_repo: False
+
+# The following package must always build from source.
+#
+# libvirt-python:
+# A pre-built wheel can be missing libvirt capabilities from the installed
+# version of libvirt-bin, leading to nova-compute failing to start.
+#
+repo_build_pip_no_binary:
+  - libvirt-python
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 54811d809e..9d2f49c42c 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -81,10 +81,6 @@ cache_timeout: {{ cache_timeout }}
 repo_build_git_cache: {{ repo_build_git_cache }}
 {% endif %}
 
-## Instruct the gate to always build libvirt-python from pip source
-repo_build_pip_no_binary:
-  - libvirt-python
-
 # The container backing store is set to 'overlayfs' to speed up the
 # AIO build time.
 lxc_container_backing_store: "{{ ((ansible_kernel | version_compare('3.18.0-0-generic', '<')) or (ansible_distribution_release | lower == 'trusty')) | ternary('dir', 'overlayfs') }}"
@@ -94,12 +90,3 @@ neutron_plugin_base:
   - router
   - metering
   - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2
-
-# TODO(odyssey4me):
-# This is in place to resolve build issues with Rally due to
-# incompatibilities between its requirements and OpenStack
-# upper constraints. This may be removed when
-# https://review.openstack.org/385360 merges and the SHA's
-# are updated to include it.
-repo_build_upper_constraints_overrides:
-  - pycparser<2.14