diff --git a/tests/installed/destructive.yml b/tests/installed/destructive.yml
index 26843e7d..9529c7e9 100644
--- a/tests/installed/destructive.yml
+++ b/tests/installed/destructive.yml
@@ -8,7 +8,10 @@
     use_git_build: True
     tests: "."
   tasks:
-    - import_tasks: overlay-git.yml
+    - import_tasks: tasks/query-host.yml
+    - set_fact:
+        rpmostree_initial_deployment: "{{ rpmostree_status[\"deployments\"][0] }}"
+    - import_tasks: tasks/overlay-git.yml
       when: use_git_build
     # Next copy all of the tests/ directory
     - name: Copy test data
diff --git a/tests/installed/nondestructive.yml b/tests/installed/nondestructive.yml
index 88a64874..dcd0d442 100644
--- a/tests/installed/nondestructive.yml
+++ b/tests/installed/nondestructive.yml
@@ -10,7 +10,8 @@
     # Arbitrary...we want some parallelism
     batching_factor: 4
   tasks:
-    - import_tasks: overlay-git.yml
+    - import_tasks: tasks/query-host.yml
+    - import_tasks: tasks/overlay-git.yml
       when: use_git_build
     # Next copy all of the tests/ directory
     - name: Copy test data
diff --git a/tests/installed/overlay-git.yml b/tests/installed/tasks/overlay-git.yml
similarity index 100%
rename from tests/installed/overlay-git.yml
rename to tests/installed/tasks/overlay-git.yml
diff --git a/tests/installed/tasks/query-host.yml b/tests/installed/tasks/query-host.yml
new file mode 100644
index 00000000..2a67dbdf
--- /dev/null
+++ b/tests/installed/tasks/query-host.yml
@@ -0,0 +1,5 @@
+- command: rpm-ostree status --json
+  changed_when: False
+  register: rpmostree_status_json
+- set_fact:
+    rpmostree_status: "{{ rpmostree_status_json.stdout | from_json }}"