diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16e9403b0dd..73d2fd8b7e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -860,16 +860,13 @@ jobs:
           command: |
             if [[ -n $CIRCLE_TAG ]]; then
               # A release build
-              /tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
-                $CIRCLE_TAG
+              ./scripts/circle-test-frontend.sh --edition << parameters.edition >> $CIRCLE_TAG
             elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
               # We're testing the release pipeline
-              /tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
-                v7.0.0-test
+              ./scripts/circle-test-frontend.sh --edition << parameters.edition >> v7.0.0-test
             else
               # A master build
-              /tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
-                --build-id $CIRCLE_WORKFLOW_ID
+              ./scripts/circle-test-frontend.sh --edition << parameters.edition >> --build-id $CIRCLE_WORKFLOW_ID
             fi
       - store_test_results:
           path: reports/junit
diff --git a/scripts/circle-test-frontend.sh b/scripts/circle-test-frontend.sh
index 3266347ab51..0194afed131 100755
--- a/scripts/circle-test-frontend.sh
+++ b/scripts/circle-test-frontend.sh
@@ -7,10 +7,7 @@ start=$(date +%s)
 
 export TEST_MAX_WORKERS=2
 
-exit_if_fail yarn run prettier:check
-exit_if_fail yarn run packages:typecheck
-exit_if_fail yarn run typecheck
-exit_if_fail yarn run test
+/tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" "$@"
 
 end=$(date +%s)
 seconds=$((end - start))