diff --git a/tests/templates/kuttl/client-spooling/10-install-trino.yaml.j2 b/tests/templates/kuttl/client-spooling/10-install-trino.yaml.j2
index 105103f..59e7d02 100644
--- a/tests/templates/kuttl/client-spooling/10-install-trino.yaml.j2
+++ b/tests/templates/kuttl/client-spooling/10-install-trino.yaml.j2
@@ -5,11 +5,11 @@ metadata:
   name: trino-client-spooling
 spec:
   image:
-{% if test_scenario['values']['trino-client-spooling'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['trino-client-spooling'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['trino-client-spooling'].split(',')[0] }}"
+{% if test_scenario['values']['trino'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['trino'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['trino'].split(',')[0] }}"
 {% else %}
-    productVersion: "{{ test_scenario['values']['trino-client-spooling'] }}"
+    productVersion: "{{ test_scenario['values']['trino'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
diff --git a/tests/templates/kuttl/client-spooling/30-test-queries.yaml.j2 b/tests/templates/kuttl/client-spooling/30-test-queries.yaml.j2
index 5433b37..54a242e 100644
--- a/tests/templates/kuttl/client-spooling/30-test-queries.yaml.j2
+++ b/tests/templates/kuttl/client-spooling/30-test-queries.yaml.j2
@@ -9,7 +9,7 @@ spec:
       containers:
         - name: test-queries
           # image: oci.stackable.tech/sdp/trino-cli:476-stackable0.0.0-dev
-          image: oci.stackable.tech/sdp/trino-cli:{{ test_scenario['values']['trino-client-spooling'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/trino-cli:{{ test_scenario['values']['trino'] }}-stackable0.0.0-dev
           command:
             - /bin/bash
             - -x
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 5e366e9..df0aca5 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -3,24 +3,17 @@ dimensions:
   - name: trino-lb
     values:
       - oci.stackable.tech/stackable/trino-lb:dev
-      # - oci.stackable.tech/stackable/trino-lb:0.5.0
+      # - foo:bar
   - name: trino
     values:
-      - "451"
-      # - "470" # Reduce test count
-      - "476"
+      - "477"
+      - "479"
       # To use a custom image, add a comma and the full name after the product version
       # - 470,oci.stackable.tech/sdp/trino:470-stackable0.0.0-dev
       # However, watch out, you need to tweak the trino-cli image
   - name: trino-latest
     values:
-      - "470"
-  # As not all Trino versions support client spooling, we have an extra dimension
-  - name: trino-client-spooling
-    values:
-      # According to https://docs.stackable.tech/home/nightly/trino/usage-guide/client-spooling-protocol/
-      # > The client spooling protocol was introduced in Trino 466 but it only works reliably starting with Trino 476.
-      - "476"
+      - "479"
   - name: trino-lb-https
     values:
       - "true"
@@ -43,7 +36,7 @@ tests:
   - name: client-spooling
     dimensions:
       - trino-lb
-      - trino-client-spooling
+      - trino
       - client-spooling-retrieval-mode
 
 # TODOS