diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79c3f12156d87144af11740533168889cfffc3fe..7d53051ad90f7adf5c1e76898aa57b1cea3ab8a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ include:
   - |
     echo "Env vars:"
     echo
-    env | grep -E '^(HOSTNAME|CLUSTER_NAME|FQDN|IP_ADDRESS|ANSIBLE_HOST_KEY_CHECKING|KANIKO_BUILD_IMAGENAME|SSH_KEY_ID|SHELL|CI_PROJECT_DIR)='
+    env | grep -E '^(HOSTNAME|CLUSTER_NAME|FQDN|IP_ADDRESS|CLUSTER_DIR|ANSIBLE_HOST_KEY_CHECKING|KANIKO_BUILD_IMAGENAME|SSH_KEY_ID|SHELL|CI_PROJECT_DIR)='
     echo
     echo "Uptime:                    $(uptime)"
     echo "KANIKO build image ref:    ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_CONTAINER_TAG}"
@@ -289,6 +289,7 @@ create-vps:
   interruptible: true
 
 test-dns:
+  # Needs a pytest ansible connection to get the configured system resolvers
   stage: install-cluster
   needs:
     - job: create-vps
@@ -430,12 +431,9 @@ enable-zulip:
     - job: install-stackspin
   script:
     - *debug_information
-    - cd ansible/
+    - cd test/
     - export KUBECONFIG="${PWD}/../clusters/${HOSTNAME}/kube_config_cluster.yml"
-    - >
-      pytest -v -s -m 'kustomizations' --resource="$RESOURCE"
-      --connection=ansible --ansible-inventory=../${CLUSTER_DIR}/inventory.yml
-      --hosts='ansible://*' --reruns 120 --reruns-delay 20
+    - pytest -v -s -m 'kustomizations' --resource="$RESOURCE" --reruns 120 --reruns-delay 20
   extends:
     - .general_rules
   interruptible: true
@@ -590,7 +588,7 @@ zulip-kustomization-ready:
   stage: certs
   script:
     - *debug_information
-    - cd ansible/
+    - cd test/
     - pytest -v -s -m 'certs' --resource="$RESOURCE" --reruns 120 --reruns-delay 10
   interruptible: true