diff --git a/.drone.yml b/.drone.yml
index 2b78694b071..615de43cda6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -337,6 +337,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -781,6 +782,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -1143,6 +1145,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -1550,6 +1553,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -1902,6 +1906,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -2311,6 +2316,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
@@ -2613,6 +2619,7 @@ steps:
 - name: test-backend
   image: grafana/build-container:1.2.28
   commands:
+  - yarn grunt no-focus-convey-tests
   - ./bin/grabpl test-backend
   - ./bin/grabpl integration-tests
   depends_on:
diff --git a/scripts/lib.star b/scripts/lib.star
index 631eef236f7..a381d82fb2d 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -437,7 +437,9 @@ def test_backend_step():
             'lint-backend',
         ],
         'commands': [
-            # First execute non-integration tests in parallel, since it should be safe
+            # First make sure that there are no tests with FocusConvey
+            'yarn grunt no-focus-convey-tests',
+            # Then execute non-integration tests in parallel, since it should be safe
             './bin/grabpl test-backend',
             # Then execute integration tests in serial
             './bin/grabpl integration-tests',