diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
index 3c2b815b5b8..2fd29ca833e 100644
--- a/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618-vk-full.toml
@@ -4,13 +4,19 @@ deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
 timeout = 300
 renderer_check = "Turnip Adreno .* 618"
-[deqp.env]
-# Force binning in the main run, which makes sure we render at
-# least 2 bins.  This is the path that impacts the most different
-# features.
-TU_DEBUG = "forcebin"
 
-# force-bypass testing
+# force-gmem testing
+# Autotuner forces sysmem on most CTS tests
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+timeout = 300
+prefix = "gmem-"
+fraction = 10
+[deqp.env]
+TU_DEBUG = "gmem,forcebin"
+
+# force-sysmem testing
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
@@ -19,15 +25,3 @@ include = ["dEQP-VK.renderpass.*"]
 prefix = "bypass-"
 [deqp.env]
 TU_DEBUG = "sysmem"
-
-# Partial test with neither force-bin nor force-sysmem.  We don't expect trouble
-# here if both of those work, but it is the default so we should do at least a
-# bit of it. Left disabled for now until we shorten our list of known fails a
-# bit more (otherwise, it's a lot of bother to track as uprevs change the
-# fraction that gets run).
-#[[deqp]]
-#deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
-#caselists = ["/deqp/mustpass/vk-master.txt"]
-#timeout = 300
-#fraction = 10
-#prefix = "defaults-"
diff --git a/src/freedreno/ci/deqp-freedreno-a618-vk.toml b/src/freedreno/ci/deqp-freedreno-a618-vk.toml
index bda24e78223..b607a23a1fa 100644
--- a/src/freedreno/ci/deqp-freedreno-a618-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618-vk.toml
@@ -5,22 +5,17 @@ caselists = ["/deqp/mustpass/vk-master.txt"]
 skips = ["install/freedreno-a618-premerge-skips.txt"]
 renderer_check = "Turnip Adreno .* 618"
 fraction = 2
-[deqp.env]
-# Force binning in the main run, which makes sure we render at
-# least 2 bins.  This is the path that impacts the most different
-# features.
-TU_DEBUG = "forcebin"
 
-# force-bypass testing
+# force-gmem testing
+# Autotuner forces sysmem on most CTS tests
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
 skips = ["install/freedreno-a618-premerge-skips.txt"]
-include = ["dEQP-VK.renderpass.*"]
-prefix = "bypass-"
+prefix = "gmem-"
 fraction = 15
 [deqp.env]
-TU_DEBUG = "sysmem"
+TU_DEBUG = "gmem,forcebin"
 
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml b/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
index 7106cb14948..b55884802f2 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk-full.toml
@@ -4,13 +4,19 @@ deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
 timeout = 300
 renderer_check = "Turnip Adreno .* 630"
-[deqp.env]
-# Force binning in the main run, which makes sure we render at
-# least 2 bins.  This is the path that impacts the most different
-# features.
-TU_DEBUG = "forcebin"
 
-# force-bypass testing
+# force-gmem testing
+# Autotuner forces sysmem on most CTS tests
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+timeout = 300
+prefix = "gmem-"
+fraction = 10
+[deqp.env]
+TU_DEBUG = "gmem,forcebin"
+
+# force-sysmem testing
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
@@ -19,15 +25,3 @@ include = ["dEQP-VK.renderpass.*"]
 prefix = "bypass-"
 [deqp.env]
 TU_DEBUG = "sysmem"
-
-# Partial test with neither force-bin nor force-sysmem.  We don't expect trouble
-# here if both of those work, but it is the default so we should do at least a
-# bit of it. Left disabled for now until we shorten our list of known fails a
-# bit more (otherwise, it's a lot of bother to track as uprevs change the
-# fraction that gets run).
-#[[deqp]]
-#deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
-#caselists = ["/deqp/mustpass/vk-master.txt"]
-#timeout = 300
-#fraction = 10
-#prefix = "defaults-"
diff --git a/src/freedreno/ci/deqp-freedreno-a630-vk.toml b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
index b9159fea29b..0e9905ba0d1 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-vk.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-vk.toml
@@ -5,13 +5,19 @@ caselists = ["/deqp/mustpass/vk-master.txt"]
 skips = ["install/freedreno-a630-premerge-skips.txt"]
 fraction = 9
 renderer_check = "Turnip Adreno .* 630"
-[deqp.env]
-# Force binning in the main run, which makes sure we render at
-# least 2 bins.  This is the path that impacts the most different
-# features.
-TU_DEBUG = "forcebin"
 
-# force-bypass testing
+# force-gmem testing
+# Autotuner forces sysmem on most CTS tests
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
+prefix = "gmem-"
+fraction = 15
+[deqp.env]
+TU_DEBUG = "gmem,forcebin"
+
+# force-sysmem testing
 [[deqp]]
 deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 5326ebc6b29..b34110bb4e7 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -1,3 +1,3 @@
 # Fails when TU_DEBUG=forcebin is set
-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
+gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
+gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index bbdd045f8fe..9eeaca3d191 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -42,8 +42,8 @@ bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.screen,Fail
 bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.softlight,Fail
 
 # Fails when TU_DEBUG=forcebin is set
-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
+gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
+gmem-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
 
 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
 glx@glx_arb_create_context_no_error@no error,Fail