diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
index 6f20348c0..1630fd7c2 100644
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -9,10 +9,9 @@
     # Set Ansible config
     - cp ansible.cfg ~/.ansible.cfg
     # Prepare inventory
-    - cp -LRp contrib/terraform/$PROVIDER/sample-inventory inventory/$CLUSTER
-    - cd inventory/$CLUSTER
-    - ln -s ../../contrib/terraform/$PROVIDER/hosts
-    - terraform init ../../contrib/terraform/$PROVIDER
+    - cp contrib/terraform/$PROVIDER/sample-inventory/cluster.tf .
+    - ln -s contrib/terraform/$PROVIDER/hosts
+    - terraform init contrib/terraform/$PROVIDER
     # Copy SSH keypair
     - mkdir -p ~/.ssh
     - echo "$PACKET_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
@@ -24,8 +23,8 @@
   stage: unit-tests
   only: ['master', /^pr-.*$/]
   script:
-    - terraform validate -var-file=cluster.tf ../../contrib/terraform/$PROVIDER
-    - terraform fmt -check -diff ../../contrib/terraform/$PROVIDER
+    - terraform validate -var-file=cluster.tf contrib/terraform/$PROVIDER
+    - terraform fmt -check -diff contrib/terraform/$PROVIDER
 
 .terraform_apply:
   extends: .terraform_install
@@ -37,8 +36,9 @@
     ANSIBLE_INVENTORY: hosts
     CI_PLATFORM: tf
   script:
-    - cd ../../tests && make create-${CI_PLATFORM} -s ; cd -
-    - ansible-playbook ../../cluster.yml --become
+    - cd tests && make create-${CI_PLATFORM} -s ; cd -
+    - ansible-playbook cluster.yml --become
+    # - tests/scripts/testcases_prepare.sh
   after_script:
     # Cleanup regardless of exit code
     - ./tests/scripts/testcases_cleanup.sh
diff --git a/tests/scripts/create-tf.sh b/tests/scripts/create-tf.sh
index 65c1d5d1c..d5c2d949a 100755
--- a/tests/scripts/create-tf.sh
+++ b/tests/scripts/create-tf.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
 
-cd "../inventory/$CLUSTER"
-terraform apply -auto-approve "../../contrib/terraform/$PROVIDER"
+cd ..
+terraform apply -auto-approve "contrib/terraform/$PROVIDER"
diff --git a/tests/scripts/delete-tf.sh b/tests/scripts/delete-tf.sh
index f85c6a752..c740d205e 100755
--- a/tests/scripts/delete-tf.sh
+++ b/tests/scripts/delete-tf.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
 
-cd "../inventory/$CLUSTER"
-terraform destroy -auto-approve "../../contrib/terraform/$PROVIDER"
+cd ..
+terraform destroy -auto-approve "contrib/terraform/$PROVIDER"