diff --git a/.github/workflows/test-bundle.yml b/.github/workflows/test-bundle.yml
index bdd69e5..82fac05 100644
--- a/.github/workflows/test-bundle.yml
+++ b/.github/workflows/test-bundle.yml
@@ -1,17 +1,24 @@
 name: Bundle Test
 
 on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'cli-extensions/bundle-test/**'
+      - 'cli-extensions/bin/ls-bundle'
+      - '.github/workflows/test-bundle.yml'
   push:
     branches:
       - main
     paths:
-      - 'bundle-test/**'
+      - 'cli-extensions/bundle-test/**'
       - 'cli-extensions/bin/ls-bundle'
       - '.github/workflows/test-bundle.yml'
   workflow_dispatch:
 
 env:
-  LOCALSTACK_AUTH_TOKEN: ${{ secrets.TEST_LOCALSTACK_AUTH_TOKEN }}
+  LOCALSTACK_AUTH_TOKEN: ${{ secrets.BUNDLE_LOCALSTACK_AUTH_TOKEN }}
   LOCALSTACK_DISABLE_EVENTS: "1"
 
 jobs:
@@ -36,7 +43,7 @@ jobs:
 
       - name: Deploy infrastructure via tflocal
         run: |
-          cd bundle-test/infra
+          cd cli-extensions/bundle-test
           tflocal init -input=false
           tflocal apply -auto-approve -input=false
 
diff --git a/bundle-test/infra/main.tf b/cli-extensions/bundle-test/main.tf
similarity index 100%
rename from bundle-test/infra/main.tf
rename to cli-extensions/bundle-test/main.tf