diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 45023843..7a2ba870 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -16,6 +16,7 @@
     name: ansible-role-ara-tests-base
     parent: base
     vars:
+      ara_tests_cleanup: false
       integration_ansible_name: "{{ ansible_user_dir }}/src/github.com/ansible/ansible"
       integration_ansible_version: null
     run: playbooks/ara_tests.yaml
@@ -61,6 +62,7 @@
     pre-run: tests/role-integration-pre.yaml
     run: playbooks/ara_api.yaml
     vars:
+      ara_tests_cleanup: false
       ara_api_source: "{{ ansible_user_dir }}/src/opendev.org/recordsansible/ara"
       ansible_python_interpreter: /usr/bin/python3
 
diff --git a/roles/ara_tests/defaults/main.yaml b/roles/ara_tests/defaults/main.yaml
index 6f4da635..33887235 100644
--- a/roles/ara_tests/defaults/main.yaml
+++ b/roles/ara_tests/defaults/main.yaml
@@ -20,13 +20,10 @@
 ara_tests_root: "/tmp/ara-integration-tests"
 
 # Directory where the virtualenv will be created
-ara_tests_virtualenv: "{{ ara_tests_root }}/virtualenv"
+ara_tests_virtualenv: "{{ ara_tests_root }}/ara-tests-virtualenv"
 
 # Directory where ARA_BASE_DIR will be set
-ara_tests_data: "{{ ara_tests_root }}/.ara"
-
-# Whether the root directory should be cleaned up between runs
-ara_tests_cleanup: true
+ara_tests_data: "{{ ara_tests_root }}/.ara/server"
 
 # Name of the Ansible package
 # This can be "ansible" which will use pip or it could be something like
diff --git a/roles/ara_tests/tasks/main.yaml b/roles/ara_tests/tasks/main.yaml
index 779ec3f6..283492a9 100644
--- a/roles/ara_tests/tasks/main.yaml
+++ b/roles/ara_tests/tasks/main.yaml
@@ -16,13 +16,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with ARA.  If not, see <http://www.gnu.org/licenses/>.
 
-- name: Clean up integration test root
-  file:
-    path: "{{ ara_tests_root }}"
-    state: absent
-  when: ara_tests_cleanup | bool
-
-- name: Create integration test root
+- name: Ensure integration test root exists
   file:
     path: "{{ ara_tests_root }}"
     state: directory
diff --git a/tests/ara_tests_post.yaml b/tests/ara_tests_post.yaml
index 9bdf3777..3513d178 100644
--- a/tests/ara_tests_post.yaml
+++ b/tests/ara_tests_post.yaml
@@ -27,7 +27,7 @@
         recurse: yes
 
     - name: Recover integration test data
-      command: cp -rp /tmp/ara-integration-tests/.ara {{ ansible_user_dir }}/workspace/logs/data
+      command: cp -rp /tmp/ara-integration-tests/.ara/server {{ ansible_user_dir }}/workspace/logs/server
 
     - name: Upload log artifacts
       synchronize: