diff --git a/.github/workflows/openstack.yml b/.github/workflows/openstack.yml
index 743e6e35..cd780b56 100644
--- a/.github/workflows/openstack.yml
+++ b/.github/workflows/openstack.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-openstack
   cancel-in-progress: true
 
 env:
@@ -32,7 +32,10 @@ env:
   tf_working_directory: "./.github/workflows/openstack/terraform"
 
 jobs: 
+    testsuite:
+      uses: ./.github/workflows/testsuite.yml
     terraform_openstack_create:
+        needs: [testsuite]
         runs-on: self-hosted
         defaults:
           run:
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index c30712fa..6e607608 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -9,6 +9,11 @@ on:
       - "*"
   pull_request:
   workflow_dispatch:
+  workflow_call:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-testsuite
+  cancel-in-progress: true
 
 jobs:
   testsuite: