diff --git a/tests/templates/kuttl/opa-authorization/20-install-trino.yaml.j2 b/tests/templates/kuttl/opa-authorization/20-install-trino.yaml.j2
index 474abf6b..be67c0a8 100644
--- a/tests/templates/kuttl/opa-authorization/20-install-trino.yaml.j2
+++ b/tests/templates/kuttl/opa-authorization/20-install-trino.yaml.j2
@@ -5,11 +5,11 @@ metadata:
   name: trino
 spec:
   image:
-{% if test_scenario['values']['trino-latest'].find(",") > 0 %}
-    custom: "{{ test_scenario['values']['trino-latest'].split(',')[1] }}"
-    productVersion: "{{ test_scenario['values']['trino-latest'].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-latest'] }}"
+    productVersion: "{{ test_scenario['values']['trino'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
diff --git a/tests/templates/kuttl/opa-authorization/check-opa.py b/tests/templates/kuttl/opa-authorization/check-opa.py.j2
similarity index 99%
rename from tests/templates/kuttl/opa-authorization/check-opa.py
rename to tests/templates/kuttl/opa-authorization/check-opa.py.j2
index 3a510665..4e478a37 100755
--- a/tests/templates/kuttl/opa-authorization/check-opa.py
+++ b/tests/templates/kuttl/opa-authorization/check-opa.py.j2
@@ -51,7 +51,11 @@
             {
                 "query": "SET SESSION iceberg.test=true",
                 # The requests are authorized, just a fake property
+{% if test_scenario['values']['trino'] == '470' %}
                 "error": "Session property iceberg.test does not exist",
+{% else %}
+                "error": "Session property 'iceberg.test' does not exist",
+{% endif %}
             },
             # ## SCHEMA ##
             # ExecuteQuery, AccessCatalog, ShowSchemas, SelectFromColumns, FilterCatalogs, FilterSchemas
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 097ab110..435d00ca 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -106,7 +106,7 @@ tests:
       - openshift
   - name: opa-authorization
     dimensions:
-      - trino-latest
+      - trino
       - hive-latest
       - opa
       - keycloak