diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
index 10d869ae..b3d4defb 100644
--- a/.github/workflows/ci-cd.yaml
+++ b/.github/workflows/ci-cd.yaml
@@ -30,7 +30,7 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    name: test ${{ matrix.label }}
+    name: trino-test ${{ matrix.label }}
     strategy:
       fail-fast: false
       matrix:
@@ -54,12 +54,12 @@ jobs:
         uses: helm/kind-action@v1.10.0
         with:
           version: v0.24.0
-      - name: Run trino tests
-        run: ./test.sh ${{ matrix.args }}
+      - name: Run tests
+        run: ./tests/trino/test.sh ${{ matrix.args }}
 
   test-gateway:
     runs-on: ubuntu-latest
-    name: test ${{ matrix.label }}
+    name: test gateway ${{ matrix.label }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.gitignore b/.gitignore
index dfbe0790..1d1786ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .idea/*
-cert.key
-cert.crt
+tests/trino/cert.key
+tests/trino/cert.crt
diff --git a/test-access-control-properties-values.yaml b/tests/trino/test-access-control-properties-values.yaml
similarity index 100%
rename from test-access-control-properties-values.yaml
rename to tests/trino/test-access-control-properties-values.yaml
diff --git a/test-exchange-manager-values.yaml b/tests/trino/test-exchange-manager-values.yaml
similarity index 100%
rename from test-exchange-manager-values.yaml
rename to tests/trino/test-exchange-manager-values.yaml
diff --git a/test-graceful-shutdown-values.yaml b/tests/trino/test-graceful-shutdown-values.yaml
similarity index 100%
rename from test-graceful-shutdown-values.yaml
rename to tests/trino/test-graceful-shutdown-values.yaml
diff --git a/test-resource-groups-properties-values.yaml b/tests/trino/test-resource-groups-properties-values.yaml
similarity index 100%
rename from test-resource-groups-properties-values.yaml
rename to tests/trino/test-resource-groups-properties-values.yaml
diff --git a/test-values.yaml b/tests/trino/test-values.yaml
similarity index 100%
rename from test-values.yaml
rename to tests/trino/test-values.yaml
diff --git a/test.sh b/tests/trino/test.sh
similarity index 94%
rename from test.sh
rename to tests/trino/test.sh
index a9dcba26..a7787f29 100755
--- a/test.sh
+++ b/tests/trino/test.sh
@@ -14,14 +14,14 @@ declare -A testCases=(
 )
 
 declare -A testCaseCharts=(
-    [default]="charts/trino"
-    [single_node]="charts/trino"
-    [complete_values]="charts/trino"
-    [overrides]="charts/trino"
-    [access_control_properties_values]="charts/trino"
-    [exchange_manager_values]="charts/trino"
-    [graceful_shutdown]="charts/trino"
-    [resource_groups_properties]="charts/trino"
+    [default]="../../charts/trino"
+    [single_node]="../../charts/trino"
+    [complete_values]="../../charts/trino"
+    [overrides]="../../charts/trino"
+    [access_control_properties_values]="../../charts/trino"
+    [exchange_manager_values]="../../charts/trino"
+    [graceful_shutdown]="../../charts/trino"
+    [resource_groups_properties]="../../charts/trino"
 )
 
 function join_by {