diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index e7b2f29..fd1c895 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -85,24 +85,23 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
+      - id: setup_terraform
+        name: Setup Terraform
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_wrapper: false
       - id: client_tests
         name: Client Tests
-        run: go test -v -cover -parallel=4 -timeout=600s -tags simulator ./migadu/...
+        run: go test -v -cover -parallel=4 -timeout=900s -tags simulator ./migadu/...
       - id: provider_tests
         name: Provider Tests
-        run: go test -v -cover -parallel=4 -timeout=600s -tags simulator ./internal/provider/
+        run: go test -v -cover -parallel=4 -timeout=900s -tags simulator ./internal/provider/
         env:
           TF_ACC: "1"
   terratest:
-    name: Terratest Tests with TF ${{ matrix.terraform }}
+    name: Terratest Tests
     needs: build
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        terraform:
-          - 1.4.*
-          - 1.5.*
     steps:
       - id: checkout
         name: Checkout
@@ -119,11 +118,10 @@ jobs:
         name: Setup Terraform
         uses: hashicorp/setup-terraform@v2
         with:
-          terraform_version: ${{ matrix.terraform }}
           terraform_wrapper: false
       - id: install
         name: Install Provider
         run: make install
       - id: terratest
         name: Run Terratest Tests
-        run: go test -parallel=4 -timeout=600s -tags simulator ./terratest/tests
+        run: go test -parallel=4 -timeout=900s -tags simulator ./terratest/tests