diff --git a/src/intel/ci/deqp-anv-tgl.toml b/src/intel/ci/deqp-anv-tgl.toml
index 33d9b146072..f0eaf7fd2a7 100644
--- a/src/intel/ci/deqp-anv-tgl.toml
+++ b/src/intel/ci/deqp-anv-tgl.toml
@@ -4,3 +4,37 @@ deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
 caselists = ["/deqp/mustpass/vk-master.txt"]
 fraction = 2
 renderer_check = "TGL GT2"
+
+# Rerun query tests with shader query optimizations (14443 tests)
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+renderer_check = "TGL GT2"
+include = ["dEQP-VK.query_pool.*"]
+prefix = "shaderquery-"
+[deqp.env]
+  query_clear_with_blorp_threshold = "0"
+  query_copy_with_shader_threshold = "0"
+
+# Rerun indirect tests with in-place generation shader optimizations
+# (3814 tests)
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+renderer_check = "TGL GT2"
+include = ["dEQP-VK.draw.*indirect*"]
+prefix = "indirectgen-inplace-"
+[deqp.env]
+  generated_indirect_threshold = "0"
+
+# Rerun indirect tests with ring-buffer generation shader optimizations
+# (3814 tests)
+[[deqp]]
+deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
+caselists = ["/deqp/mustpass/vk-master.txt"]
+renderer_check = "TGL GT2"
+include = ["dEQP-VK.draw.*indirect*"]
+prefix = "indirectgen-inring-"
+[deqp.env]
+  generated_indirect_threshold = "0"
+  generated_indirect_ring_threshold = "0"