diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
index 1f8cfd2..28e918a 100644
--- a/.github/workflows/kubernetes.yml
+++ b/.github/workflows/kubernetes.yml
@@ -114,7 +114,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c08bcdf..6f1c150 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -108,7 +108,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()
@@ -204,7 +205,8 @@ jobs:
         run: |
           # Then run integration tests
           yaks run test/consumers $YAKS_RUN_OPTIONS
-          yaks run test/user-report $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportCrime.feature $YAKS_RUN_OPTIONS
+          yaks run test/user-report/UserReportHealth.feature $YAKS_RUN_OPTIONS
           yaks run test/bridges $YAKS_RUN_OPTIONS
       - name: YAKS Report
         if: failure()
diff --git a/test/user-report/yaks-config.yaml b/test/user-report/yaks-config.yaml
index 3785d15..55cd149 100644
--- a/test/user-report/yaks-config.yaml
+++ b/test/user-report/yaks-config.yaml
@@ -31,6 +31,9 @@ pre:
     run: |
       yaks role --add strimzi
 post:
+  - name: Wait for service termination
+    run: |
+      kubectl wait --for=delete service/user-report-system --timeout=60s -n ${YAKS_NAMESPACE}
   - name: Delete secret
     run: |
       kubectl delete secret example-event-streaming-user-reporting -n ${YAKS_NAMESPACE}