diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml
index c168899..ab3efe7 100644
--- a/.github/workflows/dart_ci.yml
+++ b/.github/workflows/dart_ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ 2.13.4, stable, beta, dev ]
+        sdk: [ 2.13.4, 2.18.7 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v0.2
@@ -31,7 +31,7 @@ jobs:
         if: always() && steps.install.outcome == 'success'
 
       - name: Analyze project source
-        run: dart run dart_dev analyze
+        run: dart analyze
         if: always() && steps.install.outcome == 'success'
 
       - name: Run tests with ddc
@@ -42,18 +42,6 @@ jobs:
         run: dart run dart_dev test --release
         if: always() && steps.install.outcome == 'success'
 
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dart-lang/setup-dart@v0.2
-        with:
-          sdk: 2.13.4
-
-      - id: install
-        name: Install dependencies
-        run: dart pub get
-
       - name: Verify formatting
-        run: dart run dart_dev format --check
+        run: dart format --set-exit-if-changed .
         if: always() && steps.install.outcome == 'success'
\ No newline at end of file
diff --git a/dart_dependency_validator.yaml b/dart_dependency_validator.yaml
new file mode 100644
index 0000000..88ca34a
--- /dev/null
+++ b/dart_dependency_validator.yaml
@@ -0,0 +1,3 @@
+ignore:
+  # Ignore the pin on the test package while we have to avoid a bad version of test 1.18.1 https://github.com/dart-lang/test/issues/1620
+  - test
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 5e5663d..70b32d6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,4 +21,5 @@ dev_dependencies:
   dart_style: ^2.1.1
   dependency_validator: ^3.0.0
   over_react: ">=3.12.0 <5.0.0"
-  test: ^1.15.7
+  # Avoid a bad version of test 1.18.1 https://github.com/dart-lang/test/issues/1620
+  test: ">=1.15.7 <1.18.1"