diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
index 68d2ae9ec..4d3f3c96a 100644
--- a/.github/workflows/flutter.yml
+++ b/.github/workflows/flutter.yml
@@ -31,10 +31,6 @@ jobs:
         uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
         with:
           cache: true
-
-      # TODO: investigate why this fail on GitHub Actions
-      # - run: dart format --set-exit-if-changed --output none .
-
       - name: Run chromedriver
         run: |
           set -e
diff --git a/tool/test.sh b/tool/test.sh
index 6f55fe2a6..8f8fe61c8 100755
--- a/tool/test.sh
+++ b/tool/test.sh
@@ -4,6 +4,7 @@ set -euo pipefail
 
 (
   cd ./packages/core &&
+    dart format --set-exit-if-changed --output none . &&
     flutter analyze &&
     flutter test "$@" &&
     echo 'packages/core OK'
@@ -11,6 +12,7 @@ set -euo pipefail
 
 (
   cd ./packages/fwfh_just_audio &&
+    dart format --set-exit-if-changed --output none . &&
     flutter analyze &&
     flutter test "$@" &&
     echo 'packages/fwfh_just_audio OK'
@@ -18,6 +20,7 @@ set -euo pipefail
 
 (
   cd ./packages/fwfh_svg &&
+    dart format --set-exit-if-changed --output none . &&
     flutter analyze &&
     flutter test "$@" &&
     echo 'packages/fwfh_svg OK'
@@ -27,6 +30,7 @@ if [ -z ${UPDATE_GOLDENS+x} ]; then
   # UPDATE_GOLDENS is unset, run all packages
   (
     cd ./packages/fwfh_cached_network_image &&
+      dart format --set-exit-if-changed --output none . &&
       flutter analyze &&
       flutter test "$@" &&
       echo 'packages/fwfh_cached_network_image OK'
@@ -34,6 +38,7 @@ if [ -z ${UPDATE_GOLDENS+x} ]; then
 
   (
     cd ./packages/fwfh_chewie &&
+      dart format --set-exit-if-changed --output none . &&
       flutter analyze &&
       flutter test "$@" &&
       echo 'packages/fwfh_chewie OK'
@@ -41,6 +46,7 @@ if [ -z ${UPDATE_GOLDENS+x} ]; then
 
   (
     cd ./packages/fwfh_url_launcher &&
+      dart format --set-exit-if-changed --output none . &&
       flutter analyze &&
       flutter test "$@" &&
       echo 'packages/fwfh_url_launcher OK'
@@ -48,6 +54,7 @@ if [ -z ${UPDATE_GOLDENS+x} ]; then
 
   (
     cd ./packages/fwfh_webview &&
+      dart format --set-exit-if-changed --output none . &&
       flutter analyze &&
       flutter test "$@" &&
       echo 'packages/fwfh_webview OK'
@@ -66,6 +73,7 @@ if [ -z ${UPDATE_GOLDENS+x} ]; then
 
   (
     cd ./packages/enhanced &&
+      dart format --set-exit-if-changed --output none . &&
       flutter analyze &&
       flutter test "$@" &&
       echo 'packages/enhanced OK'
@@ -74,6 +82,7 @@ fi
 
 (
   cd ./demo_app &&
+    dart format --set-exit-if-changed --output none . &&
     flutter analyze &&
     flutter test "$@" &&
     echo 'demo_app OK'