diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f9a3ac..8dee7b6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,26 +1,11 @@
 name: test
 on:
-- pull_request
+  pull_request: { types: [opened, reopened, synchronize, ready_for_review] }
+  push: { branches: [ main ] }
+
 jobs:
-  #sendgrid_macos:
-  #  runs-on: macos-latest
-  #  env:
-  #    DEVELOPER_DIR: /Applications/Xcode_11.4_beta.app/Contents/Developer
-  #  steps:
-  #  - uses: actions/checkout@v2
-  #  - run: brew install vapor/tap/vapor-beta
-  #  - run: xcrun swift test --enable-test-discovery --sanitize=thread
-  sendgrid_xenial:
-    container: 
-      image: vapor/swift:5.2-xenial
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - run: swift test --enable-test-discovery --sanitize=thread
-  sendgrid_bionic:
-    container: 
-      image: vapor/swift:5.2-bionic
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - run: swift test --enable-test-discovery --sanitize=thread
+  unit-tests:
+    uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
+    with:
+      with_coverage: true
+      with_tsan: true