diff --git a/.github/workflows/_system_test.yml b/.github/workflows/_system_test.yml
new file mode 100644
index 000000000..7f48bdf28
--- /dev/null
+++ b/.github/workflows/_system_test.yml
@@ -0,0 +1,29 @@
+on:
+  workflow_call:
+
+env:
+  # https://github.com/pytest-dev/pytest/issues/2042
+  PY_IGNORE_IMPORTMISMATCH: "1"
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Start RabbitMQ
+        uses: namoshek/rabbitmq-github-action@v1
+        with:
+          ports: "61613:61613"
+          plugins: rabbitmq_stomp
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - name: Install python packages
+        uses: ./.github/actions/install_requirements
+  
+      - name: Run tests
+        run: tox -e system-test
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index 8fc0c8ee3..f652d4145 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -16,9 +16,6 @@ on:
 env:
   # https://github.com/pytest-dev/pytest/issues/2042
   PY_IGNORE_IMPORTMISMATCH: "1"
-  BLUEAPI_TEST_STOMP_PORTS: "[61613,61614]"
-
-
 
 jobs:
   run:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 485b82b66..53f66b6d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,11 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+  system-test:
+    needs: check
+    if: needs.check.outputs.branch-pr == ''
+    uses: ./.github/workflows/_system_test.yml
+
   container:
     needs: check
     if: needs.check.outputs.branch-pr == ''