diff --git a/.drone.yml b/.drone.yml
index 9e97b978d01..f13ee384c3d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -76,6 +76,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - lint-backend
@@ -347,6 +348,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - lint-backend
@@ -799,6 +801,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - lint-backend
@@ -1176,6 +1179,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - lint-backend
@@ -1288,6 +1292,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-backend-enterprise2
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - lint-backend
@@ -1730,6 +1735,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - lint-backend
@@ -2096,6 +2102,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - lint-backend
@@ -2208,6 +2215,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-backend-enterprise2
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - lint-backend
@@ -2647,6 +2655,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - lint-backend
@@ -2985,6 +2994,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-frontend
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - lint-backend
@@ -3095,6 +3105,7 @@ steps:
   image: grafana/build-container:1.4.3
   name: lint-backend-enterprise2
 - commands:
+  - '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1'
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - lint-backend
@@ -3438,6 +3449,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: 7f5e6041ab60e051c2dd6858adff840fa77e57ac9a7befc73aaab28f588c2318
+hmac: c8c7de29c5b4390cab96212211d21c14defa84d3029560e6b19c47a1377a6137
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 4bedc677f72..40c75ac8dc6 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -374,6 +374,8 @@ def test_backend_step(edition):
             'lint-backend',
         ],
         'commands': [
+            # First make sure that there are no tests with FocusConvey
+            '[ $(grep FocusConvey -R pkg | wc -l) -eq "0" ] || exit 1',
             './bin/grabpl test-backend --edition {}'.format(edition),
         ],
     }