diff --git a/.zuul.yaml b/.zuul.yaml
index b7c8e0cc9..a4052ac7c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -74,17 +74,12 @@
     name: watcher-tempest-multinode
     parent: watcher-tempest-functional
     nodeset: openstack-two-node
-    pre-run: playbooks/pre.yaml
-    run: playbooks/orchestrate-tempest.yaml
     roles:
       - zuul: openstack/tempest
     group-vars:
       subnode:
         devstack_local_conf:
           post-config:
-            $NOVA_CONF:
-              libvirt:
-                live_migration_uri: qemu+ssh://root@%s/system
             $WATCHER_CONF:
               watcher_cluster_data_model_collectors.compute:
                 period: 120
@@ -110,9 +105,6 @@
     vars:
       devstack_local_conf:
         post-config:
-          $NOVA_CONF:
-            libvirt:
-              live_migration_uri: qemu+ssh://root@%s/system
           $WATCHER_CONF:
             watcher_cluster_data_model_collectors.compute:
               period: 120
diff --git a/playbooks/orchestrate-tempest.yaml b/playbooks/orchestrate-tempest.yaml
deleted file mode 100644
index 5f6d82f73..000000000
--- a/playbooks/orchestrate-tempest.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- hosts: all
-  # This is the default strategy, however since orchestrate-devstack requires
-  # "linear", it is safer to enforce it in case this is running in an
-  # environment configured with a different default strategy.
-  strategy: linear
-  roles:
-    - orchestrate-devstack
-
-- hosts: tempest
-  roles:
-    - setup-tempest-run-dir
-    - setup-tempest-data-dir
-    - acl-devstack-files
-    - run-tempest
\ No newline at end of file
diff --git a/playbooks/pre.yaml b/playbooks/pre.yaml
deleted file mode 100644
index 6367cd4a0..000000000
--- a/playbooks/pre.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - add-hostnames-to-hosts
\ No newline at end of file
diff --git a/roles/add-hostnames-to-hosts/tasks/main.yaml b/roles/add-hostnames-to-hosts/tasks/main.yaml
deleted file mode 100644
index 5756752b2..000000000
--- a/roles/add-hostnames-to-hosts/tasks/main.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- name: Set up the list of hostnames and addresses
-  set_fact:
-    hostname_addresses: >
-      {% set hosts = {} -%}
-      {% for host, vars in hostvars.items() -%}
-      {% set _ = hosts.update({vars['ansible_hostname']: vars['nodepool']['private_ipv4']}) -%}
-      {% endfor -%}
-      {{- hosts -}}
-- name: Add inventory hostnames to the hosts file
-  become: yes
-  lineinfile:
-    dest: /etc/hosts
-    state: present
-    insertafter: EOF
-    line: "{{ item.value }} {{ item.key }}"
-  with_dict: "{{ hostname_addresses }}"
\ No newline at end of file