[vulkan-cts] Remove usages of global system-temp which is deprecated.

Change-Id: Icbcb81fce545d9c00996895fb9d10518dd01c9ec
diff --git a/fuchsia/gen.py b/fuchsia/gen.py
index e0e09f2..45096be 100644
--- a/fuchsia/gen.py
+++ b/fuchsia/gen.py
@@ -140,7 +140,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-%03d.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-%03d"
@@ -152,7 +152,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/meta/vulkan-cts-1.0.2.cmx b/fuchsia/meta/vulkan-cts-1.0.2.cmx
index 606fe1f..60d0510 100644
--- a/fuchsia/meta/vulkan-cts-1.0.2.cmx
+++ b/fuchsia/meta/vulkan-cts-1.0.2.cmx
@@ -24,7 +24,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/meta/vulkan-cts-no-args.cmx b/fuchsia/meta/vulkan-cts-no-args.cmx
index ca8646b..67cbbc3 100644
--- a/fuchsia/meta/vulkan-cts-no-args.cmx
+++ b/fuchsia/meta/vulkan-cts-no-args.cmx
@@ -17,7 +17,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/meta/vulkan-cts.cmx b/fuchsia/meta/vulkan-cts.cmx
index 2cba71c..1e6296e 100644
--- a/fuchsia/meta/vulkan-cts.cmx
+++ b/fuchsia/meta/vulkan-cts.cmx
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-000.cmx b/fuchsia/split-cts/meta/vulkan-cts-000.cmx
index fc1f33c..fac26fe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-000.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-000.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-000.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-000"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-001.cmx b/fuchsia/split-cts/meta/vulkan-cts-001.cmx
index 92567a3..3439e7f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-001.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-001.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-001.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-001"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-002.cmx b/fuchsia/split-cts/meta/vulkan-cts-002.cmx
index c486006..89ba322 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-002.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-002.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-002.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-002"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-003.cmx b/fuchsia/split-cts/meta/vulkan-cts-003.cmx
index 3747cb0..8f56521 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-003.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-003.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-003.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-003"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-004.cmx b/fuchsia/split-cts/meta/vulkan-cts-004.cmx
index 3226147..9192826 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-004.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-004.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-004.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-004"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-005.cmx b/fuchsia/split-cts/meta/vulkan-cts-005.cmx
index be05cff..1d6a1c4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-005.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-005.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-005.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-005"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-006.cmx b/fuchsia/split-cts/meta/vulkan-cts-006.cmx
index d2b3ec6..104a387 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-006.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-006.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-006.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-006"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-007.cmx b/fuchsia/split-cts/meta/vulkan-cts-007.cmx
index f575d72..ad71081 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-007.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-007.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-007.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-007"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-008.cmx b/fuchsia/split-cts/meta/vulkan-cts-008.cmx
index 4206af6..11b8b06 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-008.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-008.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-008.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-008"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-009.cmx b/fuchsia/split-cts/meta/vulkan-cts-009.cmx
index f1cb03d..54ea94d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-009.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-009.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-009.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-009"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-010.cmx b/fuchsia/split-cts/meta/vulkan-cts-010.cmx
index 4c37aa9..17d389e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-010.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-010.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-010.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-010"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-011.cmx b/fuchsia/split-cts/meta/vulkan-cts-011.cmx
index a4d9f30..86720f0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-011.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-011.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-011.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-011"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-012.cmx b/fuchsia/split-cts/meta/vulkan-cts-012.cmx
index 39ffdea..f9f0528 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-012.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-012.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-012.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-012"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-013.cmx b/fuchsia/split-cts/meta/vulkan-cts-013.cmx
index f855711..febbd90 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-013.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-013.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-013.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-013"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-014.cmx b/fuchsia/split-cts/meta/vulkan-cts-014.cmx
index 19a991a..2df00f3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-014.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-014.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-014.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-014"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-015.cmx b/fuchsia/split-cts/meta/vulkan-cts-015.cmx
index 5896005..1a7762f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-015.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-015.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-015.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-015"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-016.cmx b/fuchsia/split-cts/meta/vulkan-cts-016.cmx
index 6b26b94..6a673d9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-016.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-016.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-016.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-016"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-017.cmx b/fuchsia/split-cts/meta/vulkan-cts-017.cmx
index 12bc4ed..21254ca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-017.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-017.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-017.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-017"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-018.cmx b/fuchsia/split-cts/meta/vulkan-cts-018.cmx
index ab5f5c7..e94569f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-018.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-018.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-018.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-018"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-019.cmx b/fuchsia/split-cts/meta/vulkan-cts-019.cmx
index 5f90041..1ebb80d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-019.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-019.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-019.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-019"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-020.cmx b/fuchsia/split-cts/meta/vulkan-cts-020.cmx
index b15416d..4963789 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-020.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-020.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-020.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-020"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-021.cmx b/fuchsia/split-cts/meta/vulkan-cts-021.cmx
index d804f92..a9ce917 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-021.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-021.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-021.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-021"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-022.cmx b/fuchsia/split-cts/meta/vulkan-cts-022.cmx
index c9ac9b6..7dc3908 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-022.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-022.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-022.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-022"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-023.cmx b/fuchsia/split-cts/meta/vulkan-cts-023.cmx
index 51defd7..fba5111 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-023.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-023.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-023.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-023"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-024.cmx b/fuchsia/split-cts/meta/vulkan-cts-024.cmx
index 959ae73..38fcd8a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-024.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-024.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-024.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-024"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-025.cmx b/fuchsia/split-cts/meta/vulkan-cts-025.cmx
index 803343a..f28c416 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-025.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-025.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-025.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-025"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-026.cmx b/fuchsia/split-cts/meta/vulkan-cts-026.cmx
index b65ad54..0bd67ac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-026.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-026.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-026.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-026"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-027.cmx b/fuchsia/split-cts/meta/vulkan-cts-027.cmx
index adc9058..e1562c4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-027.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-027.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-027.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-027"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-028.cmx b/fuchsia/split-cts/meta/vulkan-cts-028.cmx
index 7ea6db7..0e88325 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-028.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-028.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-028.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-028"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-029.cmx b/fuchsia/split-cts/meta/vulkan-cts-029.cmx
index 593a444..bb9ddd9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-029.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-029.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-029.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-029"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-030.cmx b/fuchsia/split-cts/meta/vulkan-cts-030.cmx
index f88679e..8c3f3ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-030.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-030.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-030.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-030"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-031.cmx b/fuchsia/split-cts/meta/vulkan-cts-031.cmx
index 58b15a5..053c112 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-031.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-031.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-031.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-031"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-032.cmx b/fuchsia/split-cts/meta/vulkan-cts-032.cmx
index ab8f526..9bb9bd1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-032.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-032.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-032.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-032"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-033.cmx b/fuchsia/split-cts/meta/vulkan-cts-033.cmx
index 005e5ad..0b4df88 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-033.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-033.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-033.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-033"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-034.cmx b/fuchsia/split-cts/meta/vulkan-cts-034.cmx
index dfbbca5..ed98b41 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-034.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-034.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-034.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-034"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-035.cmx b/fuchsia/split-cts/meta/vulkan-cts-035.cmx
index 40b1bd7..1c5f00c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-035.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-035.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-035.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-035"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-036.cmx b/fuchsia/split-cts/meta/vulkan-cts-036.cmx
index 09040ba..49b72bf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-036.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-036.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-036.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-036"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-037.cmx b/fuchsia/split-cts/meta/vulkan-cts-037.cmx
index bd14a5b..6d2afdf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-037.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-037.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-037.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-037"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-038.cmx b/fuchsia/split-cts/meta/vulkan-cts-038.cmx
index a3db743..f25b777 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-038.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-038.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-038.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-038"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-039.cmx b/fuchsia/split-cts/meta/vulkan-cts-039.cmx
index e2fe31c..d629d04 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-039.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-039.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-039.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-039"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-040.cmx b/fuchsia/split-cts/meta/vulkan-cts-040.cmx
index 3990b42..ebbcc74 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-040.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-040.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-040.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-040"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-041.cmx b/fuchsia/split-cts/meta/vulkan-cts-041.cmx
index 48e41ff..37327ac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-041.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-041.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-041.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-041"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-042.cmx b/fuchsia/split-cts/meta/vulkan-cts-042.cmx
index f0e7dd6..ee45d2f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-042.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-042.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-042.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-042"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-043.cmx b/fuchsia/split-cts/meta/vulkan-cts-043.cmx
index aeebcd4..29495de 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-043.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-043.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-043.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-043"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-044.cmx b/fuchsia/split-cts/meta/vulkan-cts-044.cmx
index f5a5fe0..91ce8fa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-044.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-044.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-044.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-044"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-045.cmx b/fuchsia/split-cts/meta/vulkan-cts-045.cmx
index 79bd596..95f16a4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-045.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-045.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-045.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-045"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-046.cmx b/fuchsia/split-cts/meta/vulkan-cts-046.cmx
index 269e610..8d799a2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-046.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-046.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-046.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-046"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-047.cmx b/fuchsia/split-cts/meta/vulkan-cts-047.cmx
index b27732e..b5212f4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-047.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-047.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-047.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-047"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-048.cmx b/fuchsia/split-cts/meta/vulkan-cts-048.cmx
index 69a2cc0..124120b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-048.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-048.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-048.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-048"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-049.cmx b/fuchsia/split-cts/meta/vulkan-cts-049.cmx
index 1eb64cb..696307b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-049.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-049.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-049.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-049"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-050.cmx b/fuchsia/split-cts/meta/vulkan-cts-050.cmx
index 831f4e8..a7e57df 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-050.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-050.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-050.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-050"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-051.cmx b/fuchsia/split-cts/meta/vulkan-cts-051.cmx
index 5bab10d..e632eed 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-051.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-051.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-051.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-051"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-052.cmx b/fuchsia/split-cts/meta/vulkan-cts-052.cmx
index 9fe0593..97514dd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-052.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-052.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-052.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-052"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-053.cmx b/fuchsia/split-cts/meta/vulkan-cts-053.cmx
index 72f55cc..2b9adb6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-053.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-053.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-053.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-053"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-054.cmx b/fuchsia/split-cts/meta/vulkan-cts-054.cmx
index 1cced8b..710337e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-054.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-054.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-054.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-054"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-055.cmx b/fuchsia/split-cts/meta/vulkan-cts-055.cmx
index 1ad90c8..e31d85a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-055.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-055.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-055.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-055"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-056.cmx b/fuchsia/split-cts/meta/vulkan-cts-056.cmx
index 86abaac..ad667b8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-056.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-056.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-056.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-056"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-057.cmx b/fuchsia/split-cts/meta/vulkan-cts-057.cmx
index 50e00e3..2962773 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-057.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-057.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-057.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-057"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-058.cmx b/fuchsia/split-cts/meta/vulkan-cts-058.cmx
index 9ae7a02..8c3a6c5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-058.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-058.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-058.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-058"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-059.cmx b/fuchsia/split-cts/meta/vulkan-cts-059.cmx
index d0cadf2..628dd93 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-059.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-059.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-059.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-059"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-060.cmx b/fuchsia/split-cts/meta/vulkan-cts-060.cmx
index cd9258d..cab825d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-060.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-060.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-060.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-060"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-061.cmx b/fuchsia/split-cts/meta/vulkan-cts-061.cmx
index d04dd26..d56e7e1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-061.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-061.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-061.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-061"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-062.cmx b/fuchsia/split-cts/meta/vulkan-cts-062.cmx
index 53f1218..dd69d56 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-062.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-062.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-062.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-062"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-063.cmx b/fuchsia/split-cts/meta/vulkan-cts-063.cmx
index 7c905b4..adfd7f9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-063.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-063.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-063.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-063"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-064.cmx b/fuchsia/split-cts/meta/vulkan-cts-064.cmx
index d18f386..563af5d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-064.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-064.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-064.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-064"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-065.cmx b/fuchsia/split-cts/meta/vulkan-cts-065.cmx
index 6d92937..4aff6e4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-065.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-065.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-065.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-065"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-066.cmx b/fuchsia/split-cts/meta/vulkan-cts-066.cmx
index cc8adb8..bf2185a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-066.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-066.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-066.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-066"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-067.cmx b/fuchsia/split-cts/meta/vulkan-cts-067.cmx
index 45182fc..180bb33 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-067.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-067.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-067.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-067"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-068.cmx b/fuchsia/split-cts/meta/vulkan-cts-068.cmx
index b7f1fa0..245d24f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-068.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-068.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-068.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-068"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-069.cmx b/fuchsia/split-cts/meta/vulkan-cts-069.cmx
index b61938b..feefeb1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-069.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-069.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-069.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-069"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-070.cmx b/fuchsia/split-cts/meta/vulkan-cts-070.cmx
index 2cce331..b08f0a9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-070.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-070.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-070.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-070"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-071.cmx b/fuchsia/split-cts/meta/vulkan-cts-071.cmx
index 49f2f66..00aafc0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-071.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-071.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-071.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-071"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-072.cmx b/fuchsia/split-cts/meta/vulkan-cts-072.cmx
index d8937b4..3ccfcac 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-072.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-072.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-072.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-072"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-073.cmx b/fuchsia/split-cts/meta/vulkan-cts-073.cmx
index 42d1a99..07aac24 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-073.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-073.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-073.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-073"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-074.cmx b/fuchsia/split-cts/meta/vulkan-cts-074.cmx
index 1bc8232..06bc55c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-074.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-074.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-074.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-074"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-075.cmx b/fuchsia/split-cts/meta/vulkan-cts-075.cmx
index 2c80032..9985092 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-075.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-075.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-075.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-075"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-076.cmx b/fuchsia/split-cts/meta/vulkan-cts-076.cmx
index 4298cfd..ffb83c2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-076.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-076.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-076.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-076"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-077.cmx b/fuchsia/split-cts/meta/vulkan-cts-077.cmx
index 66da62d..aacac71 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-077.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-077.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-077.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-077"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-078.cmx b/fuchsia/split-cts/meta/vulkan-cts-078.cmx
index fdea392..7d23feb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-078.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-078.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-078.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-078"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-079.cmx b/fuchsia/split-cts/meta/vulkan-cts-079.cmx
index 05da16e..df7ea45 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-079.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-079.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-079.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-079"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-080.cmx b/fuchsia/split-cts/meta/vulkan-cts-080.cmx
index 743be0c..3b39ba3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-080.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-080.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-080.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-080"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-081.cmx b/fuchsia/split-cts/meta/vulkan-cts-081.cmx
index 44ddaa4..e5e0e5d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-081.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-081.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-081.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-081"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-082.cmx b/fuchsia/split-cts/meta/vulkan-cts-082.cmx
index d3d6337..e219f97 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-082.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-082.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-082.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-082"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-083.cmx b/fuchsia/split-cts/meta/vulkan-cts-083.cmx
index ff85aa4..26ca5c1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-083.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-083.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-083.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-083"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-084.cmx b/fuchsia/split-cts/meta/vulkan-cts-084.cmx
index c998892..fa34fec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-084.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-084.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-084.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-084"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-085.cmx b/fuchsia/split-cts/meta/vulkan-cts-085.cmx
index 8bc075d..5a3df80 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-085.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-085.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-085.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-085"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-086.cmx b/fuchsia/split-cts/meta/vulkan-cts-086.cmx
index e1ff735..ed73334 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-086.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-086.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-086.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-086"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-087.cmx b/fuchsia/split-cts/meta/vulkan-cts-087.cmx
index 11d22e0..7838644 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-087.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-087.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-087.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-087"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-088.cmx b/fuchsia/split-cts/meta/vulkan-cts-088.cmx
index d8a9adc..eee8cab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-088.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-088.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-088.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-088"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-089.cmx b/fuchsia/split-cts/meta/vulkan-cts-089.cmx
index 60b2786..e022f0e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-089.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-089.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-089.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-089"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-090.cmx b/fuchsia/split-cts/meta/vulkan-cts-090.cmx
index e2a1488..49b2855 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-090.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-090.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-090.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-090"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-091.cmx b/fuchsia/split-cts/meta/vulkan-cts-091.cmx
index e075ab4..2951982 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-091.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-091.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-091.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-091"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-092.cmx b/fuchsia/split-cts/meta/vulkan-cts-092.cmx
index ef23c82..79d4a00 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-092.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-092.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-092.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-092"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-093.cmx b/fuchsia/split-cts/meta/vulkan-cts-093.cmx
index 830e0664..83fe62b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-093.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-093.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-093.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-093"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-094.cmx b/fuchsia/split-cts/meta/vulkan-cts-094.cmx
index 981acfa..e3ab4b1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-094.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-094.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-094.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-094"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-095.cmx b/fuchsia/split-cts/meta/vulkan-cts-095.cmx
index 84f051f..7309879 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-095.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-095.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-095.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-095"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-096.cmx b/fuchsia/split-cts/meta/vulkan-cts-096.cmx
index abd7031..76ec95e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-096.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-096.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-096.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-096"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-097.cmx b/fuchsia/split-cts/meta/vulkan-cts-097.cmx
index a9ada03..6168f33 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-097.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-097.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-097.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-097"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-098.cmx b/fuchsia/split-cts/meta/vulkan-cts-098.cmx
index ee2b51b..7f2c6ea 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-098.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-098.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-098.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-098"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-099.cmx b/fuchsia/split-cts/meta/vulkan-cts-099.cmx
index 8b1f332..d8ba290 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-099.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-099.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-099.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-099"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-100.cmx b/fuchsia/split-cts/meta/vulkan-cts-100.cmx
index 855f96d..ead7b43 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-100.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-100.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-100.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-100"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-101.cmx b/fuchsia/split-cts/meta/vulkan-cts-101.cmx
index 817d314..c668ea7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-101.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-101.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-101.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-101"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-102.cmx b/fuchsia/split-cts/meta/vulkan-cts-102.cmx
index 86753bc..ac9c3d5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-102.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-102.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-102.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-102"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-103.cmx b/fuchsia/split-cts/meta/vulkan-cts-103.cmx
index adcaacd..56837d5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-103.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-103.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-103.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-103"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-104.cmx b/fuchsia/split-cts/meta/vulkan-cts-104.cmx
index ed51bc7..96aefee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-104.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-104.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-104.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-104"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-105.cmx b/fuchsia/split-cts/meta/vulkan-cts-105.cmx
index 9615947..f21d092 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-105.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-105.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-105.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-105"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-106.cmx b/fuchsia/split-cts/meta/vulkan-cts-106.cmx
index 8c925ae..3dd5a0e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-106.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-106.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-106.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-106"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-107.cmx b/fuchsia/split-cts/meta/vulkan-cts-107.cmx
index ead6a96..20527b2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-107.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-107.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-107.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-107"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-108.cmx b/fuchsia/split-cts/meta/vulkan-cts-108.cmx
index 8f4374a..92a1b49 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-108.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-108.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-108.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-108"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-109.cmx b/fuchsia/split-cts/meta/vulkan-cts-109.cmx
index ef191d2..ee88be1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-109.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-109.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-109.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-109"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-110.cmx b/fuchsia/split-cts/meta/vulkan-cts-110.cmx
index 8a0f6ce..db9ed40 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-110.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-110.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-110.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-110"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-111.cmx b/fuchsia/split-cts/meta/vulkan-cts-111.cmx
index bc688dd..c2a1ed0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-111.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-111.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-111.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-111"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-112.cmx b/fuchsia/split-cts/meta/vulkan-cts-112.cmx
index 339ac07..333c941 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-112.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-112.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-112.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-112"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-113.cmx b/fuchsia/split-cts/meta/vulkan-cts-113.cmx
index 7dde13f..a39010e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-113.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-113.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-113.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-113"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-114.cmx b/fuchsia/split-cts/meta/vulkan-cts-114.cmx
index ebd7c6f..54b9af4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-114.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-114.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-114.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-114"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-115.cmx b/fuchsia/split-cts/meta/vulkan-cts-115.cmx
index 5d72dad..45bc1f1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-115.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-115.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-115.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-115"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-116.cmx b/fuchsia/split-cts/meta/vulkan-cts-116.cmx
index 59573b8..9ecd969 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-116.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-116.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-116.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-116"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-117.cmx b/fuchsia/split-cts/meta/vulkan-cts-117.cmx
index 1069a0c..03271d8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-117.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-117.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-117.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-117"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-118.cmx b/fuchsia/split-cts/meta/vulkan-cts-118.cmx
index f63e872..47fd2f3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-118.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-118.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-118.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-118"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-119.cmx b/fuchsia/split-cts/meta/vulkan-cts-119.cmx
index f10d7b1..58292b4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-119.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-119.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-119.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-119"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-120.cmx b/fuchsia/split-cts/meta/vulkan-cts-120.cmx
index 54cea08..3977223 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-120.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-120.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-120.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-120"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-121.cmx b/fuchsia/split-cts/meta/vulkan-cts-121.cmx
index 39f0f61..4d3e61f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-121.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-121.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-121.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-121"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-122.cmx b/fuchsia/split-cts/meta/vulkan-cts-122.cmx
index 1a7cb1c..c788c81 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-122.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-122.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-122.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-122"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-123.cmx b/fuchsia/split-cts/meta/vulkan-cts-123.cmx
index 115e054..ad07197 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-123.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-123.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-123.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-123"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-124.cmx b/fuchsia/split-cts/meta/vulkan-cts-124.cmx
index 04a2f26..8f76316 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-124.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-124.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-124.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-124"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-125.cmx b/fuchsia/split-cts/meta/vulkan-cts-125.cmx
index 9aa0d1a..798997d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-125.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-125.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-125.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-125"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-126.cmx b/fuchsia/split-cts/meta/vulkan-cts-126.cmx
index 5196d78..bc19400 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-126.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-126.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-126.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-126"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-127.cmx b/fuchsia/split-cts/meta/vulkan-cts-127.cmx
index 9f878e4..a9e335e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-127.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-127.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-127.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-127"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-128.cmx b/fuchsia/split-cts/meta/vulkan-cts-128.cmx
index 1a6a605..72bee38 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-128.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-128.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-128.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-128"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-129.cmx b/fuchsia/split-cts/meta/vulkan-cts-129.cmx
index 6a97a36..54a7b48 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-129.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-129.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-129.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-129"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-130.cmx b/fuchsia/split-cts/meta/vulkan-cts-130.cmx
index ddc6ac8..724ea6c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-130.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-130.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-130.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-130"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-131.cmx b/fuchsia/split-cts/meta/vulkan-cts-131.cmx
index 641c958..a9e5899 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-131.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-131.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-131.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-131"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-132.cmx b/fuchsia/split-cts/meta/vulkan-cts-132.cmx
index 899b8d6..386e3aa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-132.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-132.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-132.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-132"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-133.cmx b/fuchsia/split-cts/meta/vulkan-cts-133.cmx
index d8160dc..813b69d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-133.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-133.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-133.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-133"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-134.cmx b/fuchsia/split-cts/meta/vulkan-cts-134.cmx
index 852d889..5d557d1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-134.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-134.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-134.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-134"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-135.cmx b/fuchsia/split-cts/meta/vulkan-cts-135.cmx
index 58a5f36..586e70a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-135.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-135.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-135.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-135"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-136.cmx b/fuchsia/split-cts/meta/vulkan-cts-136.cmx
index 1ab86c0..219b1f7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-136.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-136.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-136.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-136"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-137.cmx b/fuchsia/split-cts/meta/vulkan-cts-137.cmx
index 52e523b..4ae1fdc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-137.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-137.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-137.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-137"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-138.cmx b/fuchsia/split-cts/meta/vulkan-cts-138.cmx
index 601dd81..8eb0982 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-138.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-138.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-138.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-138"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-139.cmx b/fuchsia/split-cts/meta/vulkan-cts-139.cmx
index 168f240..2bac3be 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-139.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-139.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-139.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-139"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-140.cmx b/fuchsia/split-cts/meta/vulkan-cts-140.cmx
index f81159f..3ee22a8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-140.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-140.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-140.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-140"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-141.cmx b/fuchsia/split-cts/meta/vulkan-cts-141.cmx
index e1e3f8c..6297848 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-141.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-141.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-141.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-141"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-142.cmx b/fuchsia/split-cts/meta/vulkan-cts-142.cmx
index 7f52fe7..261ab49 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-142.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-142.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-142.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-142"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-143.cmx b/fuchsia/split-cts/meta/vulkan-cts-143.cmx
index 3e80230..d800b1b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-143.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-143.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-143.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-143"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-144.cmx b/fuchsia/split-cts/meta/vulkan-cts-144.cmx
index 2aa1576..3196549 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-144.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-144.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-144.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-144"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-145.cmx b/fuchsia/split-cts/meta/vulkan-cts-145.cmx
index 1a6587d..9c14968 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-145.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-145.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-145.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-145"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-146.cmx b/fuchsia/split-cts/meta/vulkan-cts-146.cmx
index faab624..bfe2af6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-146.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-146.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-146.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-146"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-147.cmx b/fuchsia/split-cts/meta/vulkan-cts-147.cmx
index b60d361..8f61c5d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-147.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-147.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-147.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-147"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-148.cmx b/fuchsia/split-cts/meta/vulkan-cts-148.cmx
index ca994a1..674a4c7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-148.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-148.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-148.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-148"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-149.cmx b/fuchsia/split-cts/meta/vulkan-cts-149.cmx
index 3ac0ab9..66d7e32 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-149.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-149.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-149.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-149"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-150.cmx b/fuchsia/split-cts/meta/vulkan-cts-150.cmx
index 6558505..12f403d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-150.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-150.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-150.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-150"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-151.cmx b/fuchsia/split-cts/meta/vulkan-cts-151.cmx
index 0e94272..59393a4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-151.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-151.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-151.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-151"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-152.cmx b/fuchsia/split-cts/meta/vulkan-cts-152.cmx
index 2c19e3d..2b17f27 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-152.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-152.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-152.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-152"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-153.cmx b/fuchsia/split-cts/meta/vulkan-cts-153.cmx
index 29b8695..374653e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-153.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-153.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-153.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-153"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-154.cmx b/fuchsia/split-cts/meta/vulkan-cts-154.cmx
index 3d6351c..16b5d01 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-154.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-154.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-154.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-154"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-155.cmx b/fuchsia/split-cts/meta/vulkan-cts-155.cmx
index c853e05..d5b312d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-155.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-155.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-155.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-155"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-156.cmx b/fuchsia/split-cts/meta/vulkan-cts-156.cmx
index eaaed11..f7247cf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-156.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-156.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-156.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-156"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-157.cmx b/fuchsia/split-cts/meta/vulkan-cts-157.cmx
index 35489cc..6b944f9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-157.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-157.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-157.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-157"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-158.cmx b/fuchsia/split-cts/meta/vulkan-cts-158.cmx
index 23a9b09..a4759eb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-158.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-158.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-158.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-158"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-159.cmx b/fuchsia/split-cts/meta/vulkan-cts-159.cmx
index 46fe40f..80fd22a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-159.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-159.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-159.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-159"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-160.cmx b/fuchsia/split-cts/meta/vulkan-cts-160.cmx
index c988514..692285d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-160.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-160.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-160.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-160"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-161.cmx b/fuchsia/split-cts/meta/vulkan-cts-161.cmx
index ddc3931..37b3560 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-161.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-161.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-161.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-161"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-162.cmx b/fuchsia/split-cts/meta/vulkan-cts-162.cmx
index 1561c2e..76931c8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-162.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-162.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-162.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-162"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-163.cmx b/fuchsia/split-cts/meta/vulkan-cts-163.cmx
index f23d592..4710f69 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-163.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-163.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-163.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-163"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-164.cmx b/fuchsia/split-cts/meta/vulkan-cts-164.cmx
index e943a39..0c784d6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-164.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-164.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-164.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-164"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-165.cmx b/fuchsia/split-cts/meta/vulkan-cts-165.cmx
index e51f707..84f6c3d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-165.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-165.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-165.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-165"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-166.cmx b/fuchsia/split-cts/meta/vulkan-cts-166.cmx
index 1b1cd4e..f05ea28 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-166.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-166.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-166.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-166"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-167.cmx b/fuchsia/split-cts/meta/vulkan-cts-167.cmx
index 1a2d4c6..c8d16dd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-167.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-167.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-167.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-167"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-168.cmx b/fuchsia/split-cts/meta/vulkan-cts-168.cmx
index e93aca5..7a65a1f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-168.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-168.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-168.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-168"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-169.cmx b/fuchsia/split-cts/meta/vulkan-cts-169.cmx
index 828162b..5c3de46 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-169.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-169.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-169.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-169"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-170.cmx b/fuchsia/split-cts/meta/vulkan-cts-170.cmx
index 4ad366b..dcc0fb4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-170.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-170.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-170.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-170"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-171.cmx b/fuchsia/split-cts/meta/vulkan-cts-171.cmx
index d9a74de..235fd18 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-171.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-171.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-171.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-171"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-172.cmx b/fuchsia/split-cts/meta/vulkan-cts-172.cmx
index 416b068..3878868 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-172.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-172.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-172.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-172"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-173.cmx b/fuchsia/split-cts/meta/vulkan-cts-173.cmx
index 69f571e..58a4c23 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-173.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-173.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-173.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-173"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-174.cmx b/fuchsia/split-cts/meta/vulkan-cts-174.cmx
index 94602c4..4abb9f8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-174.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-174.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-174.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-174"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-175.cmx b/fuchsia/split-cts/meta/vulkan-cts-175.cmx
index cec4449..899763a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-175.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-175.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-175.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-175"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-176.cmx b/fuchsia/split-cts/meta/vulkan-cts-176.cmx
index 6733222..08a4399 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-176.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-176.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-176.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-176"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-177.cmx b/fuchsia/split-cts/meta/vulkan-cts-177.cmx
index 07c7795..3bc5ccb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-177.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-177.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-177.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-177"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-178.cmx b/fuchsia/split-cts/meta/vulkan-cts-178.cmx
index f12dad4..d96cdfb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-178.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-178.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-178.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-178"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-179.cmx b/fuchsia/split-cts/meta/vulkan-cts-179.cmx
index 85651bf..3ef38ed 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-179.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-179.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-179.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-179"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-180.cmx b/fuchsia/split-cts/meta/vulkan-cts-180.cmx
index 2f09d78..10036f3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-180.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-180.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-180.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-180"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-181.cmx b/fuchsia/split-cts/meta/vulkan-cts-181.cmx
index a86f831..b27b9f8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-181.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-181.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-181.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-181"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-182.cmx b/fuchsia/split-cts/meta/vulkan-cts-182.cmx
index 6a9c12e..18df351 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-182.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-182.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-182.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-182"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-183.cmx b/fuchsia/split-cts/meta/vulkan-cts-183.cmx
index fb599d2..f12f4a0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-183.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-183.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-183.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-183"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-184.cmx b/fuchsia/split-cts/meta/vulkan-cts-184.cmx
index 783430e..f522f34 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-184.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-184.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-184.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-184"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-185.cmx b/fuchsia/split-cts/meta/vulkan-cts-185.cmx
index 080bfdc..5560e32 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-185.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-185.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-185.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-185"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-186.cmx b/fuchsia/split-cts/meta/vulkan-cts-186.cmx
index 0f3fbf2..54e8dfb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-186.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-186.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-186.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-186"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-187.cmx b/fuchsia/split-cts/meta/vulkan-cts-187.cmx
index 16eea15..e371504 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-187.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-187.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-187.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-187"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-188.cmx b/fuchsia/split-cts/meta/vulkan-cts-188.cmx
index d8b67b1..63057f1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-188.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-188.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-188.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-188"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-189.cmx b/fuchsia/split-cts/meta/vulkan-cts-189.cmx
index 0ecf2f5..639d4ae 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-189.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-189.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-189.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-189"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-190.cmx b/fuchsia/split-cts/meta/vulkan-cts-190.cmx
index 0295d5b..32549b2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-190.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-190.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-190.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-190"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-191.cmx b/fuchsia/split-cts/meta/vulkan-cts-191.cmx
index 85bed78..b1bf155 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-191.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-191.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-191.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-191"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-192.cmx b/fuchsia/split-cts/meta/vulkan-cts-192.cmx
index e92c7f1..35b18af 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-192.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-192.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-192.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-192"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-193.cmx b/fuchsia/split-cts/meta/vulkan-cts-193.cmx
index 7062b74..5436b5b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-193.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-193.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-193.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-193"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-194.cmx b/fuchsia/split-cts/meta/vulkan-cts-194.cmx
index d7f9e2b..404d2b9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-194.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-194.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-194.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-194"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-195.cmx b/fuchsia/split-cts/meta/vulkan-cts-195.cmx
index f257163..03be3d7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-195.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-195.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-195.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-195"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-196.cmx b/fuchsia/split-cts/meta/vulkan-cts-196.cmx
index 6ae0271..fe4e938 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-196.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-196.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-196.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-196"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-197.cmx b/fuchsia/split-cts/meta/vulkan-cts-197.cmx
index 444e607..9f8f619 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-197.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-197.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-197.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-197"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-198.cmx b/fuchsia/split-cts/meta/vulkan-cts-198.cmx
index 2779f8c..bef60b8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-198.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-198.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-198.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-198"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-199.cmx b/fuchsia/split-cts/meta/vulkan-cts-199.cmx
index 5038ca2..7b47bc3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-199.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-199.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-199.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-199"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-200.cmx b/fuchsia/split-cts/meta/vulkan-cts-200.cmx
index 3fcf160..c6bcde9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-200.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-200.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-200.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-200"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-201.cmx b/fuchsia/split-cts/meta/vulkan-cts-201.cmx
index 53be1bc..5ba5414 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-201.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-201.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-201.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-201"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-202.cmx b/fuchsia/split-cts/meta/vulkan-cts-202.cmx
index 316efdf..383585a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-202.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-202.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-202.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-202"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-203.cmx b/fuchsia/split-cts/meta/vulkan-cts-203.cmx
index 412c88d..3793db4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-203.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-203.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-203.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-203"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-204.cmx b/fuchsia/split-cts/meta/vulkan-cts-204.cmx
index 48e34e3..4547164 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-204.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-204.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-204.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-204"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-205.cmx b/fuchsia/split-cts/meta/vulkan-cts-205.cmx
index 36a5f8c..8641596 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-205.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-205.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-205.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-205"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-206.cmx b/fuchsia/split-cts/meta/vulkan-cts-206.cmx
index bbc412d..e8d053e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-206.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-206.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-206.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-206"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-207.cmx b/fuchsia/split-cts/meta/vulkan-cts-207.cmx
index b37fcb7..402c345 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-207.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-207.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-207.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-207"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-208.cmx b/fuchsia/split-cts/meta/vulkan-cts-208.cmx
index ebb6144..8c83da1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-208.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-208.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-208.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-208"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-209.cmx b/fuchsia/split-cts/meta/vulkan-cts-209.cmx
index 455119a..6c06190 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-209.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-209.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-209.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-209"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-210.cmx b/fuchsia/split-cts/meta/vulkan-cts-210.cmx
index 4f3d270..c0c2f08 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-210.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-210.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-210.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-210"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-211.cmx b/fuchsia/split-cts/meta/vulkan-cts-211.cmx
index cabfe1e..b57e93b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-211.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-211.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-211.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-211"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-212.cmx b/fuchsia/split-cts/meta/vulkan-cts-212.cmx
index 7d0e205..979aae6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-212.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-212.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-212.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-212"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-213.cmx b/fuchsia/split-cts/meta/vulkan-cts-213.cmx
index 8c0e1c7..f773e0f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-213.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-213.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-213.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-213"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-214.cmx b/fuchsia/split-cts/meta/vulkan-cts-214.cmx
index eb4838b..bec0454 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-214.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-214.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-214.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-214"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-215.cmx b/fuchsia/split-cts/meta/vulkan-cts-215.cmx
index 0d71d45..a0bb442 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-215.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-215.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-215.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-215"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-216.cmx b/fuchsia/split-cts/meta/vulkan-cts-216.cmx
index 0088140..31457d1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-216.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-216.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-216.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-216"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-217.cmx b/fuchsia/split-cts/meta/vulkan-cts-217.cmx
index d237e71..80de2ae 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-217.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-217.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-217.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-217"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-218.cmx b/fuchsia/split-cts/meta/vulkan-cts-218.cmx
index e22d482..26497c9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-218.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-218.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-218.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-218"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-219.cmx b/fuchsia/split-cts/meta/vulkan-cts-219.cmx
index c8f614c..49d6d53 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-219.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-219.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-219.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-219"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-220.cmx b/fuchsia/split-cts/meta/vulkan-cts-220.cmx
index 26acaaa..255a6b4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-220.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-220.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-220.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-220"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-221.cmx b/fuchsia/split-cts/meta/vulkan-cts-221.cmx
index 9d14c1a..b020bce 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-221.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-221.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-221.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-221"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-222.cmx b/fuchsia/split-cts/meta/vulkan-cts-222.cmx
index a7c8d81..fcb3125 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-222.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-222.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-222.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-222"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-223.cmx b/fuchsia/split-cts/meta/vulkan-cts-223.cmx
index 6dca3df..3c43d34 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-223.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-223.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-223.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-223"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-224.cmx b/fuchsia/split-cts/meta/vulkan-cts-224.cmx
index 6b52a5d..b3224e7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-224.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-224.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-224.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-224"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-225.cmx b/fuchsia/split-cts/meta/vulkan-cts-225.cmx
index 48efa25..a3ebdca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-225.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-225.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-225.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-225"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-226.cmx b/fuchsia/split-cts/meta/vulkan-cts-226.cmx
index 2391efa..67b040d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-226.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-226.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-226.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-226"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-227.cmx b/fuchsia/split-cts/meta/vulkan-cts-227.cmx
index d85b6cc..1cbb068 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-227.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-227.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-227.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-227"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-228.cmx b/fuchsia/split-cts/meta/vulkan-cts-228.cmx
index 73286d7..f7c31f7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-228.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-228.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-228.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-228"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-229.cmx b/fuchsia/split-cts/meta/vulkan-cts-229.cmx
index c1202d3..eb6e5a7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-229.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-229.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-229.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-229"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-230.cmx b/fuchsia/split-cts/meta/vulkan-cts-230.cmx
index 4deb003..3c26247 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-230.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-230.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-230.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-230"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-231.cmx b/fuchsia/split-cts/meta/vulkan-cts-231.cmx
index 86c202b..86f3259 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-231.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-231.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-231.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-231"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-232.cmx b/fuchsia/split-cts/meta/vulkan-cts-232.cmx
index 7ac506c..3ee1064 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-232.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-232.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-232.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-232"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-233.cmx b/fuchsia/split-cts/meta/vulkan-cts-233.cmx
index 374a03e..fd13d8a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-233.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-233.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-233.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-233"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-234.cmx b/fuchsia/split-cts/meta/vulkan-cts-234.cmx
index 36059d8..7617767 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-234.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-234.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-234.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-234"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-235.cmx b/fuchsia/split-cts/meta/vulkan-cts-235.cmx
index 7214f38..caa568e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-235.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-235.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-235.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-235"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-236.cmx b/fuchsia/split-cts/meta/vulkan-cts-236.cmx
index 812280b..c5ef130 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-236.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-236.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-236.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-236"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-237.cmx b/fuchsia/split-cts/meta/vulkan-cts-237.cmx
index faa3dfe..46caf1e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-237.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-237.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-237.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-237"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-238.cmx b/fuchsia/split-cts/meta/vulkan-cts-238.cmx
index f840966..65e391b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-238.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-238.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-238.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-238"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-239.cmx b/fuchsia/split-cts/meta/vulkan-cts-239.cmx
index af47dec..df62a12 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-239.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-239.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-239.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-239"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-240.cmx b/fuchsia/split-cts/meta/vulkan-cts-240.cmx
index 511c29a..e24aab5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-240.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-240.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-240.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-240"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-241.cmx b/fuchsia/split-cts/meta/vulkan-cts-241.cmx
index 3a51618..21564ef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-241.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-241.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-241.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-241"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-242.cmx b/fuchsia/split-cts/meta/vulkan-cts-242.cmx
index aa15ab4..5d0159e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-242.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-242.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-242.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-242"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-243.cmx b/fuchsia/split-cts/meta/vulkan-cts-243.cmx
index cd7386c..58eea0d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-243.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-243.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-243.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-243"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-244.cmx b/fuchsia/split-cts/meta/vulkan-cts-244.cmx
index db3a367..0f4d882 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-244.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-244.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-244.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-244"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-245.cmx b/fuchsia/split-cts/meta/vulkan-cts-245.cmx
index 9d16ff6..d4d6b75 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-245.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-245.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-245.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-245"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-246.cmx b/fuchsia/split-cts/meta/vulkan-cts-246.cmx
index e3aab33..d8d885e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-246.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-246.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-246.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-246"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-247.cmx b/fuchsia/split-cts/meta/vulkan-cts-247.cmx
index 03d336c..c222240 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-247.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-247.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-247.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-247"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-248.cmx b/fuchsia/split-cts/meta/vulkan-cts-248.cmx
index 26612db..8b76eb7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-248.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-248.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-248.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-248"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-249.cmx b/fuchsia/split-cts/meta/vulkan-cts-249.cmx
index afdf348..3d57702 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-249.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-249.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-249.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-249"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-250.cmx b/fuchsia/split-cts/meta/vulkan-cts-250.cmx
index ee4fc03..5162fa7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-250.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-250.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-250.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-250"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-251.cmx b/fuchsia/split-cts/meta/vulkan-cts-251.cmx
index 9a9e6ef..cff3e3c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-251.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-251.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-251.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-251"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-252.cmx b/fuchsia/split-cts/meta/vulkan-cts-252.cmx
index b6112f8..9b59fb6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-252.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-252.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-252.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-252"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-253.cmx b/fuchsia/split-cts/meta/vulkan-cts-253.cmx
index 12ec43a..54c9c25 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-253.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-253.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-253.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-253"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-254.cmx b/fuchsia/split-cts/meta/vulkan-cts-254.cmx
index 44c0bb4..d2709fa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-254.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-254.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-254.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-254"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-255.cmx b/fuchsia/split-cts/meta/vulkan-cts-255.cmx
index 391eb49..97a7d6f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-255.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-255.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-255.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-255"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-256.cmx b/fuchsia/split-cts/meta/vulkan-cts-256.cmx
index f97a3da..2756a70 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-256.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-256.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-256.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-256"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-257.cmx b/fuchsia/split-cts/meta/vulkan-cts-257.cmx
index 6949350..2c36f22 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-257.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-257.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-257.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-257"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-258.cmx b/fuchsia/split-cts/meta/vulkan-cts-258.cmx
index 520b1b6..95279aa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-258.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-258.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-258.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-258"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-259.cmx b/fuchsia/split-cts/meta/vulkan-cts-259.cmx
index 5225d21..3eb7cd0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-259.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-259.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-259.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-259"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-260.cmx b/fuchsia/split-cts/meta/vulkan-cts-260.cmx
index 3b8d061..af34f18 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-260.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-260.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-260.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-260"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-261.cmx b/fuchsia/split-cts/meta/vulkan-cts-261.cmx
index 37169a2..292b73f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-261.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-261.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-261.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-261"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-262.cmx b/fuchsia/split-cts/meta/vulkan-cts-262.cmx
index dd57702..1dbe337 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-262.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-262.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-262.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-262"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-263.cmx b/fuchsia/split-cts/meta/vulkan-cts-263.cmx
index 3a5254d..6f781e1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-263.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-263.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-263.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-263"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-264.cmx b/fuchsia/split-cts/meta/vulkan-cts-264.cmx
index 9c4cc90..1085736 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-264.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-264.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-264.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-264"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-265.cmx b/fuchsia/split-cts/meta/vulkan-cts-265.cmx
index 61a736c..d0aa48d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-265.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-265.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-265.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-265"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-266.cmx b/fuchsia/split-cts/meta/vulkan-cts-266.cmx
index 1a5412b..275ba82 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-266.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-266.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-266.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-266"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-267.cmx b/fuchsia/split-cts/meta/vulkan-cts-267.cmx
index 0c035eb..6f61ab9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-267.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-267.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-267.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-267"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-268.cmx b/fuchsia/split-cts/meta/vulkan-cts-268.cmx
index 2d6dbfe..377e93a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-268.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-268.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-268.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-268"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-269.cmx b/fuchsia/split-cts/meta/vulkan-cts-269.cmx
index 13a66f3..7babfc0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-269.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-269.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-269.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-269"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-270.cmx b/fuchsia/split-cts/meta/vulkan-cts-270.cmx
index 67db811..c939365 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-270.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-270.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-270.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-270"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-271.cmx b/fuchsia/split-cts/meta/vulkan-cts-271.cmx
index 6a75bdc..e64a0ec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-271.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-271.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-271.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-271"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-272.cmx b/fuchsia/split-cts/meta/vulkan-cts-272.cmx
index 3bd8a80..94b5787 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-272.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-272.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-272.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-272"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-273.cmx b/fuchsia/split-cts/meta/vulkan-cts-273.cmx
index a6024e4..a065a40 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-273.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-273.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-273.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-273"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-274.cmx b/fuchsia/split-cts/meta/vulkan-cts-274.cmx
index 254a76d..c1108b7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-274.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-274.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-274.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-274"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-275.cmx b/fuchsia/split-cts/meta/vulkan-cts-275.cmx
index dcce298..a67a505 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-275.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-275.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-275.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-275"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-276.cmx b/fuchsia/split-cts/meta/vulkan-cts-276.cmx
index da73d62..281fc63 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-276.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-276.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-276.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-276"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-277.cmx b/fuchsia/split-cts/meta/vulkan-cts-277.cmx
index a660cd8..88d82c3 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-277.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-277.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-277.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-277"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-278.cmx b/fuchsia/split-cts/meta/vulkan-cts-278.cmx
index eaf87e5..67fad98 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-278.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-278.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-278.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-278"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-279.cmx b/fuchsia/split-cts/meta/vulkan-cts-279.cmx
index d0a604e..5fdaca2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-279.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-279.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-279.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-279"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-280.cmx b/fuchsia/split-cts/meta/vulkan-cts-280.cmx
index 540d91f..8a5f8c7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-280.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-280.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-280.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-280"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-281.cmx b/fuchsia/split-cts/meta/vulkan-cts-281.cmx
index 5947503..9fd12fb 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-281.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-281.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-281.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-281"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-282.cmx b/fuchsia/split-cts/meta/vulkan-cts-282.cmx
index 1171c6b..bb6f117 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-282.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-282.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-282.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-282"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-283.cmx b/fuchsia/split-cts/meta/vulkan-cts-283.cmx
index 2643fec..2dcf8ee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-283.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-283.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-283.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-283"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-284.cmx b/fuchsia/split-cts/meta/vulkan-cts-284.cmx
index a3f9d03..dbdd9de 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-284.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-284.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-284.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-284"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-285.cmx b/fuchsia/split-cts/meta/vulkan-cts-285.cmx
index 1e58f40..cde47ef 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-285.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-285.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-285.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-285"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-286.cmx b/fuchsia/split-cts/meta/vulkan-cts-286.cmx
index 9b4669f..64f2e74 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-286.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-286.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-286.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-286"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-287.cmx b/fuchsia/split-cts/meta/vulkan-cts-287.cmx
index d93c6a1..185149b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-287.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-287.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-287.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-287"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-288.cmx b/fuchsia/split-cts/meta/vulkan-cts-288.cmx
index 772a720..2fcaea9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-288.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-288.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-288.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-288"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-289.cmx b/fuchsia/split-cts/meta/vulkan-cts-289.cmx
index a9bb04a..0cecb0f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-289.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-289.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-289.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-289"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-290.cmx b/fuchsia/split-cts/meta/vulkan-cts-290.cmx
index 46a4860..3bf21f9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-290.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-290.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-290.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-290"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-291.cmx b/fuchsia/split-cts/meta/vulkan-cts-291.cmx
index 35916f5..9c5476f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-291.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-291.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-291.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-291"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-292.cmx b/fuchsia/split-cts/meta/vulkan-cts-292.cmx
index 040a6f1..de5b824 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-292.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-292.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-292.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-292"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-293.cmx b/fuchsia/split-cts/meta/vulkan-cts-293.cmx
index d1f7052..e51c527 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-293.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-293.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-293.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-293"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-294.cmx b/fuchsia/split-cts/meta/vulkan-cts-294.cmx
index b9af654..b743abc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-294.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-294.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-294.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-294"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-295.cmx b/fuchsia/split-cts/meta/vulkan-cts-295.cmx
index 963fb0d..1cf9ab4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-295.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-295.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-295.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-295"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-296.cmx b/fuchsia/split-cts/meta/vulkan-cts-296.cmx
index 528e844..48f52fa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-296.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-296.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-296.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-296"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-297.cmx b/fuchsia/split-cts/meta/vulkan-cts-297.cmx
index cfea838..9555ed5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-297.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-297.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-297.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-297"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-298.cmx b/fuchsia/split-cts/meta/vulkan-cts-298.cmx
index f39862d..41b994c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-298.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-298.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-298.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-298"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-299.cmx b/fuchsia/split-cts/meta/vulkan-cts-299.cmx
index 4957a57..7469f37 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-299.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-299.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-299.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-299"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-300.cmx b/fuchsia/split-cts/meta/vulkan-cts-300.cmx
index fcdf982..51d7490 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-300.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-300.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-300.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-300"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-301.cmx b/fuchsia/split-cts/meta/vulkan-cts-301.cmx
index 0904320..81e2ab6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-301.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-301.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-301.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-301"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-302.cmx b/fuchsia/split-cts/meta/vulkan-cts-302.cmx
index 7d10bee..1f5eb68 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-302.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-302.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-302.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-302"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-303.cmx b/fuchsia/split-cts/meta/vulkan-cts-303.cmx
index 06e345d..79057cc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-303.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-303.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-303.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-303"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-304.cmx b/fuchsia/split-cts/meta/vulkan-cts-304.cmx
index 51d2b7d..267c709 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-304.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-304.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-304.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-304"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-305.cmx b/fuchsia/split-cts/meta/vulkan-cts-305.cmx
index 58a4ef0..65ab696 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-305.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-305.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-305.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-305"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-306.cmx b/fuchsia/split-cts/meta/vulkan-cts-306.cmx
index 0d43686..272ed8c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-306.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-306.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-306.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-306"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-307.cmx b/fuchsia/split-cts/meta/vulkan-cts-307.cmx
index a2be985..8a90ffa 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-307.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-307.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-307.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-307"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-308.cmx b/fuchsia/split-cts/meta/vulkan-cts-308.cmx
index 0fb316c..92364c4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-308.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-308.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-308.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-308"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-309.cmx b/fuchsia/split-cts/meta/vulkan-cts-309.cmx
index 16c8b4e..7320397 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-309.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-309.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-309.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-309"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-310.cmx b/fuchsia/split-cts/meta/vulkan-cts-310.cmx
index 7239644..7a61af6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-310.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-310.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-310.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-310"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-311.cmx b/fuchsia/split-cts/meta/vulkan-cts-311.cmx
index b7cc720..1791ecf 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-311.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-311.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-311.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-311"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-312.cmx b/fuchsia/split-cts/meta/vulkan-cts-312.cmx
index ffadb7d..fa8ee2c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-312.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-312.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-312.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-312"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-313.cmx b/fuchsia/split-cts/meta/vulkan-cts-313.cmx
index 01e6357..52010d0 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-313.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-313.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-313.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-313"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-314.cmx b/fuchsia/split-cts/meta/vulkan-cts-314.cmx
index 8d0cdda..8e67b53 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-314.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-314.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-314.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-314"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-315.cmx b/fuchsia/split-cts/meta/vulkan-cts-315.cmx
index f2363db..bbef2ca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-315.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-315.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-315.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-315"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-316.cmx b/fuchsia/split-cts/meta/vulkan-cts-316.cmx
index c6e0599..a79369e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-316.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-316.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-316.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-316"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-317.cmx b/fuchsia/split-cts/meta/vulkan-cts-317.cmx
index 888a8d1..742f238 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-317.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-317.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-317.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-317"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-318.cmx b/fuchsia/split-cts/meta/vulkan-cts-318.cmx
index 2417fa7..672b474 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-318.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-318.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-318.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-318"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-319.cmx b/fuchsia/split-cts/meta/vulkan-cts-319.cmx
index e96445c..d50b18a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-319.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-319.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-319.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-319"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-320.cmx b/fuchsia/split-cts/meta/vulkan-cts-320.cmx
index 1575645..f272700 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-320.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-320.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-320.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-320"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-321.cmx b/fuchsia/split-cts/meta/vulkan-cts-321.cmx
index a540070..25afd97 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-321.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-321.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-321.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-321"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-322.cmx b/fuchsia/split-cts/meta/vulkan-cts-322.cmx
index e06d229..b424611 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-322.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-322.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-322.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-322"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-323.cmx b/fuchsia/split-cts/meta/vulkan-cts-323.cmx
index 650e291..e02b96a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-323.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-323.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-323.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-323"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-324.cmx b/fuchsia/split-cts/meta/vulkan-cts-324.cmx
index 92baf68..8c56f92 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-324.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-324.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-324.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-324"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-325.cmx b/fuchsia/split-cts/meta/vulkan-cts-325.cmx
index 15525a4..8b24bba 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-325.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-325.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-325.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-325"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-326.cmx b/fuchsia/split-cts/meta/vulkan-cts-326.cmx
index b5d7e5e..d35917a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-326.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-326.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-326.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-326"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-327.cmx b/fuchsia/split-cts/meta/vulkan-cts-327.cmx
index fbb6721..258d139 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-327.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-327.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-327.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-327"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-328.cmx b/fuchsia/split-cts/meta/vulkan-cts-328.cmx
index bc7b506..564d495 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-328.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-328.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-328.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-328"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-329.cmx b/fuchsia/split-cts/meta/vulkan-cts-329.cmx
index f5b4e22..a135656 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-329.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-329.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-329.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-329"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-330.cmx b/fuchsia/split-cts/meta/vulkan-cts-330.cmx
index e924ce8..7a39a3c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-330.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-330.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-330.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-330"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-331.cmx b/fuchsia/split-cts/meta/vulkan-cts-331.cmx
index d1b446e..fb92608 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-331.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-331.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-331.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-331"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-332.cmx b/fuchsia/split-cts/meta/vulkan-cts-332.cmx
index aa36ef7..abb1227 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-332.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-332.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-332.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-332"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-333.cmx b/fuchsia/split-cts/meta/vulkan-cts-333.cmx
index 811f960..4e056b9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-333.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-333.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-333.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-333"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-334.cmx b/fuchsia/split-cts/meta/vulkan-cts-334.cmx
index f4acfd3..8994ad7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-334.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-334.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-334.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-334"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-335.cmx b/fuchsia/split-cts/meta/vulkan-cts-335.cmx
index 7d438e2..7c4bcfe 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-335.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-335.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-335.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-335"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-336.cmx b/fuchsia/split-cts/meta/vulkan-cts-336.cmx
index 7f74111..02005ab 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-336.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-336.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-336.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-336"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-337.cmx b/fuchsia/split-cts/meta/vulkan-cts-337.cmx
index ec96475..f0fb31f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-337.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-337.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-337.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-337"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-338.cmx b/fuchsia/split-cts/meta/vulkan-cts-338.cmx
index 0c78c7e..fbc9914 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-338.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-338.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-338.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-338"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-339.cmx b/fuchsia/split-cts/meta/vulkan-cts-339.cmx
index 12a5392..16da051 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-339.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-339.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-339.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-339"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-340.cmx b/fuchsia/split-cts/meta/vulkan-cts-340.cmx
index 8547957..0dbfaca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-340.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-340.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-340.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-340"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-341.cmx b/fuchsia/split-cts/meta/vulkan-cts-341.cmx
index 594233d..ca9893c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-341.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-341.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-341.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-341"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-342.cmx b/fuchsia/split-cts/meta/vulkan-cts-342.cmx
index a953b40..a891bca 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-342.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-342.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-342.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-342"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-343.cmx b/fuchsia/split-cts/meta/vulkan-cts-343.cmx
index e6528b4..fa675b6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-343.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-343.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-343.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-343"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-344.cmx b/fuchsia/split-cts/meta/vulkan-cts-344.cmx
index 5fad326..2a1cba8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-344.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-344.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-344.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-344"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-345.cmx b/fuchsia/split-cts/meta/vulkan-cts-345.cmx
index 8e1cd4f..db17609 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-345.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-345.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-345.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-345"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-346.cmx b/fuchsia/split-cts/meta/vulkan-cts-346.cmx
index 56470a9..815778b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-346.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-346.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-346.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-346"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-347.cmx b/fuchsia/split-cts/meta/vulkan-cts-347.cmx
index b23d4ae..fd0d338 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-347.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-347.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-347.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-347"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-348.cmx b/fuchsia/split-cts/meta/vulkan-cts-348.cmx
index 95ccc8a..751a278 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-348.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-348.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-348.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-348"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-349.cmx b/fuchsia/split-cts/meta/vulkan-cts-349.cmx
index 865ba8f..1a0fd4a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-349.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-349.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-349.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-349"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-350.cmx b/fuchsia/split-cts/meta/vulkan-cts-350.cmx
index f199812..f46a56e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-350.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-350.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-350.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-350"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-351.cmx b/fuchsia/split-cts/meta/vulkan-cts-351.cmx
index bd2538a..d1fbaec 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-351.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-351.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-351.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-351"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-352.cmx b/fuchsia/split-cts/meta/vulkan-cts-352.cmx
index dfb11a6..98d8a34 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-352.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-352.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-352.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-352"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-353.cmx b/fuchsia/split-cts/meta/vulkan-cts-353.cmx
index b5bd48b..6345c66 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-353.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-353.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-353.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-353"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-354.cmx b/fuchsia/split-cts/meta/vulkan-cts-354.cmx
index d9b09e2..e857c9f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-354.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-354.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-354.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-354"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-355.cmx b/fuchsia/split-cts/meta/vulkan-cts-355.cmx
index 6b61be1..532293a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-355.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-355.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-355.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-355"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-356.cmx b/fuchsia/split-cts/meta/vulkan-cts-356.cmx
index 54b8651..269e9cd 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-356.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-356.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-356.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-356"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-357.cmx b/fuchsia/split-cts/meta/vulkan-cts-357.cmx
index e401412..fed94d1 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-357.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-357.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-357.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-357"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-358.cmx b/fuchsia/split-cts/meta/vulkan-cts-358.cmx
index 5271b91..38f971b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-358.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-358.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-358.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-358"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-359.cmx b/fuchsia/split-cts/meta/vulkan-cts-359.cmx
index 25c3df0..cc666da 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-359.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-359.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-359.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-359"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-360.cmx b/fuchsia/split-cts/meta/vulkan-cts-360.cmx
index 7a54cbe..99c7ac9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-360.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-360.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-360.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-360"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-361.cmx b/fuchsia/split-cts/meta/vulkan-cts-361.cmx
index d12d554..9098830 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-361.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-361.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-361.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-361"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-362.cmx b/fuchsia/split-cts/meta/vulkan-cts-362.cmx
index 96942a2..052ac5c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-362.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-362.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-362.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-362"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-363.cmx b/fuchsia/split-cts/meta/vulkan-cts-363.cmx
index 3179866..7c10201 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-363.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-363.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-363.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-363"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-364.cmx b/fuchsia/split-cts/meta/vulkan-cts-364.cmx
index 12e0e96..88a1b7c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-364.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-364.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-364.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-364"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-365.cmx b/fuchsia/split-cts/meta/vulkan-cts-365.cmx
index 44a3ead..cf9fb0f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-365.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-365.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-365.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-365"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-366.cmx b/fuchsia/split-cts/meta/vulkan-cts-366.cmx
index dc3d507..390db2e 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-366.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-366.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-366.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-366"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-367.cmx b/fuchsia/split-cts/meta/vulkan-cts-367.cmx
index a674f98..45dcca8 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-367.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-367.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-367.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-367"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-368.cmx b/fuchsia/split-cts/meta/vulkan-cts-368.cmx
index 802cdbc..8fcf853 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-368.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-368.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-368.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-368"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-369.cmx b/fuchsia/split-cts/meta/vulkan-cts-369.cmx
index 385d6b5..d871df6 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-369.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-369.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-369.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-369"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-370.cmx b/fuchsia/split-cts/meta/vulkan-cts-370.cmx
index 0c12745..bd74d48 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-370.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-370.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-370.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-370"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-371.cmx b/fuchsia/split-cts/meta/vulkan-cts-371.cmx
index a8dd3fa..d5204db 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-371.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-371.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-371.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-371"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-372.cmx b/fuchsia/split-cts/meta/vulkan-cts-372.cmx
index 358b68e..678e618 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-372.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-372.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-372.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-372"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-373.cmx b/fuchsia/split-cts/meta/vulkan-cts-373.cmx
index de9ba2e..3b2379f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-373.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-373.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-373.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-373"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-374.cmx b/fuchsia/split-cts/meta/vulkan-cts-374.cmx
index 2967006..8196dd5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-374.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-374.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-374.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-374"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-375.cmx b/fuchsia/split-cts/meta/vulkan-cts-375.cmx
index 919baea..0e3696a 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-375.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-375.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-375.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-375"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-376.cmx b/fuchsia/split-cts/meta/vulkan-cts-376.cmx
index cf65c82..5d3e8499 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-376.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-376.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-376.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-376"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-377.cmx b/fuchsia/split-cts/meta/vulkan-cts-377.cmx
index 9b56f30..b22a9c7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-377.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-377.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-377.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-377"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-378.cmx b/fuchsia/split-cts/meta/vulkan-cts-378.cmx
index 25b6881..9d54d5b 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-378.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-378.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-378.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-378"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-379.cmx b/fuchsia/split-cts/meta/vulkan-cts-379.cmx
index c8e1c3a..0d82f5f 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-379.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-379.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-379.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-379"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-380.cmx b/fuchsia/split-cts/meta/vulkan-cts-380.cmx
index d1c1313..2bc9bdc 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-380.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-380.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-380.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-380"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-381.cmx b/fuchsia/split-cts/meta/vulkan-cts-381.cmx
index 47c3991..e2ae295 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-381.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-381.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-381.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-381"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-382.cmx b/fuchsia/split-cts/meta/vulkan-cts-382.cmx
index b78ef3b..9860134 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-382.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-382.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-382.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-382"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-383.cmx b/fuchsia/split-cts/meta/vulkan-cts-383.cmx
index 9769ecb..306004c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-383.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-383.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-383.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-383"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-384.cmx b/fuchsia/split-cts/meta/vulkan-cts-384.cmx
index b95ecf6..7538c12 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-384.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-384.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-384.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-384"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-385.cmx b/fuchsia/split-cts/meta/vulkan-cts-385.cmx
index ff93764..f11ee2d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-385.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-385.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-385.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-385"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-386.cmx b/fuchsia/split-cts/meta/vulkan-cts-386.cmx
index 5dafabe..61cca2d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-386.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-386.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-386.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-386"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-387.cmx b/fuchsia/split-cts/meta/vulkan-cts-387.cmx
index b36f27d..6b7b3e9 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-387.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-387.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-387.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-387"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-388.cmx b/fuchsia/split-cts/meta/vulkan-cts-388.cmx
index 9632e7a..3b96ca2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-388.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-388.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-388.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-388"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-389.cmx b/fuchsia/split-cts/meta/vulkan-cts-389.cmx
index 710d445..7ef16de 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-389.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-389.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-389.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-389"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-390.cmx b/fuchsia/split-cts/meta/vulkan-cts-390.cmx
index a9447c8..370ef6c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-390.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-390.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-390.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-390"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-391.cmx b/fuchsia/split-cts/meta/vulkan-cts-391.cmx
index 0007b53..b2ca438 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-391.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-391.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-391.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-391"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-392.cmx b/fuchsia/split-cts/meta/vulkan-cts-392.cmx
index 047e759..ed03d95 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-392.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-392.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-392.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-392"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-393.cmx b/fuchsia/split-cts/meta/vulkan-cts-393.cmx
index 427fa06..ec41624 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-393.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-393.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-393.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-393"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-394.cmx b/fuchsia/split-cts/meta/vulkan-cts-394.cmx
index 5c7e359..dfbcf25 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-394.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-394.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-394.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-394"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-395.cmx b/fuchsia/split-cts/meta/vulkan-cts-395.cmx
index 47082d0..30d15ee 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-395.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-395.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-395.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-395"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-396.cmx b/fuchsia/split-cts/meta/vulkan-cts-396.cmx
index 1301cee..5f02790 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-396.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-396.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-396.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-396"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-397.cmx b/fuchsia/split-cts/meta/vulkan-cts-397.cmx
index 1187cad..f30a998 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-397.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-397.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-397.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-397"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-398.cmx b/fuchsia/split-cts/meta/vulkan-cts-398.cmx
index 7855ee9..761ea0d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-398.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-398.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-398.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-398"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-399.cmx b/fuchsia/split-cts/meta/vulkan-cts-399.cmx
index 45b08e4..b4f78a2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-399.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-399.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-399.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-399"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-400.cmx b/fuchsia/split-cts/meta/vulkan-cts-400.cmx
index 89fb353..c09b86c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-400.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-400.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-400.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-400"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-401.cmx b/fuchsia/split-cts/meta/vulkan-cts-401.cmx
index c7aacc0..85541a2 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-401.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-401.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-401.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-401"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-402.cmx b/fuchsia/split-cts/meta/vulkan-cts-402.cmx
index f02e072..896b918 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-402.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-402.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-402.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-402"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-403.cmx b/fuchsia/split-cts/meta/vulkan-cts-403.cmx
index 9379da9..fd80c54 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-403.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-403.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-403.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-403"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-404.cmx b/fuchsia/split-cts/meta/vulkan-cts-404.cmx
index 30fdfb3..6dc6746 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-404.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-404.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-404.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-404"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-405.cmx b/fuchsia/split-cts/meta/vulkan-cts-405.cmx
index 991798a..95c5e07 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-405.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-405.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-405.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-405"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-406.cmx b/fuchsia/split-cts/meta/vulkan-cts-406.cmx
index 90a0b1d..cd7955d 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-406.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-406.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-406.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-406"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-407.cmx b/fuchsia/split-cts/meta/vulkan-cts-407.cmx
index 2342a45..9f16e67 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-407.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-407.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-407.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-407"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-408.cmx b/fuchsia/split-cts/meta/vulkan-cts-408.cmx
index 04a8038..2c55946 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-408.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-408.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-408.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-408"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-409.cmx b/fuchsia/split-cts/meta/vulkan-cts-409.cmx
index 5620919..f62df94 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-409.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-409.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-409.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-409"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-410.cmx b/fuchsia/split-cts/meta/vulkan-cts-410.cmx
index 6b88342..742c889 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-410.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-410.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-410.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-410"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-411.cmx b/fuchsia/split-cts/meta/vulkan-cts-411.cmx
index 567767a..3a4b3e4 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-411.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-411.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-411.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-411"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-412.cmx b/fuchsia/split-cts/meta/vulkan-cts-412.cmx
index 361739b..e3aca48 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-412.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-412.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-412.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-412"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-413.cmx b/fuchsia/split-cts/meta/vulkan-cts-413.cmx
index 8d87f0c..16c810c 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-413.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-413.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-413.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-413"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-414.cmx b/fuchsia/split-cts/meta/vulkan-cts-414.cmx
index 0a6f9b2..2c1efe7 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-414.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-414.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-414.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-414"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-415.cmx b/fuchsia/split-cts/meta/vulkan-cts-415.cmx
index 0b84591..5ea6143 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-415.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-415.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-415.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-415"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-416.cmx b/fuchsia/split-cts/meta/vulkan-cts-416.cmx
index 75f5907..e789ac5 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-416.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-416.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-416.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-416"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-417.cmx b/fuchsia/split-cts/meta/vulkan-cts-417.cmx
index d7d33c5..7270169 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-417.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-417.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-417.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-417"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-418.cmx b/fuchsia/split-cts/meta/vulkan-cts-418.cmx
index 50e34ce..af7f050 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-418.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-418.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-418.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-418"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [
diff --git a/fuchsia/split-cts/meta/vulkan-cts-419.cmx b/fuchsia/split-cts/meta/vulkan-cts-419.cmx
index 8d01023..e7ce755 100644
--- a/fuchsia/split-cts/meta/vulkan-cts-419.cmx
+++ b/fuchsia/split-cts/meta/vulkan-cts-419.cmx
@@ -13,7 +13,7 @@
             "--deqp-caselist-file=/pkg/data/vk-list-419.txt",
             "--deqp-log-images=disable",
             "--deqp-log-shader-sources=disable",
-            "--deqp-log-filename=/tmp/TestResults.qpa",
+            "--deqp-log-filename=/data/TestResults.qpa",
             "--deqp-log-flush=disable"
         ],
         "binary": "test/vulkan-cts-419"
@@ -25,7 +25,6 @@
         "features": [
             "vulkan",
             "isolated-persistent-storage",
-            "system-temp",
             "deprecated-ambient-replace-as-executable"
         ],
         "services": [