diff --git a/ansible/kolla-target-venv.yml b/ansible/kolla-target-venv.yml
index 9a556b9a0..ad5c504a6 100644
--- a/ansible/kolla-target-venv.yml
+++ b/ansible/kolla-target-venv.yml
@@ -47,7 +47,10 @@
             name: docker
             state: latest
             virtualenv: "{{ kolla_ansible_target_venv }}"
-            extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
+            # FIXME(mgoddard): docker 5.0.1 is currently in master
+            # upper-constraints, but fails with an unexpected keyword argument,
+            # 'disable_buffering'. Install it without UC for now.
+            # extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
           become: True
 
         - name: Ensure kolla-ansible virtualenv has SELinux bindings installed
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index c0487a462..6db29bc78 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -72,9 +72,15 @@ control
 [hacluster-remote:children]
 compute
 
-[haproxy:children]
+[loadbalancer:children]
 network
 
+[keepalived:children]
+loadbalancer
+
+[haproxy:children]
+loadbalancer
+
 [mariadb:children]
 control
 
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
new file mode 100644
index 000000000..45cf6a0f4
--- /dev/null
+++ b/molecule-requirements.txt
@@ -0,0 +1,10 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+docker # Apache-2.0
+molecule # MIT
+molecule-docker # MIT
+pytest-molecule # MIT
+pytest-testinfra
+yamllint # GPLv3
diff --git a/test-requirements.txt b/test-requirements.txt
index f31841340..934a4b189 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,13 +6,7 @@ ansible-lint>=3.0.0,!=4.3.0 # MIT
 bashate>=0.2 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 doc8 # Apache-2.0
-docker # Apache-2.0
 hacking>=3.0.1,<3.1.0 # Apache-2.0
-molecule # MIT
-molecule-docker # MIT
 oslotest>=1.10.0 # Apache-2.0
-paramiko
-pytest-molecule # MIT
-pytest-testinfra
 stestr # Apache-2.0
 yamllint # GPLv3
diff --git a/tox.ini b/tox.ini
index bb75ac49e..323d8f015 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,9 +60,11 @@ commands =
 
 [testenv:molecule]
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    # TODO(priteau): Restore upper constraints once molecule dependency
+    # resolution is working
+    #-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/molecule-requirements.txt
 whitelist_externals =
     bash
 commands =