diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fd881802..e1ffccc9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,33 +1,12 @@
 name: test
-on: { pull_request: {} }
+on:
+  pull_request: { branches: ['*'] }
+  push: { branches: ['main'] }
 
 jobs:
-  getcidata:
-    runs-on: ubuntu-latest
-    outputs:
-      environments: ${{ steps.output.outputs.environments }}
-    steps:
-      - id: output
-        run: |
-          envblob="$(curl -fsSL https://raw.githubusercontent.com/vapor/ci/main/pr-environments.json | jq -cMj '.')"
-          echo "::set-output name=environments::${envblob}"
-
-  test-fluent:
-    needs: getcidata
-    strategy:
-      fail-fast: false
-      matrix:
-        env: ${{ fromJSON(needs.getcidata.outputs.environments) }}
-    runs-on: ${{ matrix.env.os }}
-    container: ${{ matrix.env.image }}
-    steps: 
-      - name: Select toolchain
-        uses: maxim-lobanov/setup-xcode@v1.2.1
-        with:
-          xcode-version: ${{ matrix.env.toolchain }}
-        if: ${{ matrix.env.toolchain != '' }}
-      - name: Check out Vapor
-        uses: actions/checkout@v2
-      - name: Run tests with Thread Sanitizer
-        timeout-minutes: 30
-        run: swift test --enable-test-discovery --sanitize=thread
\ No newline at end of file
+  unit-tests:
+     uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
+     with:
+       with_coverage: true
+       with_tsan: true
+       with_public_api_check: ${{ github.event_name == 'pull_request' }}
diff --git a/Package.swift b/Package.swift
index a100642b..c58f0c96 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
@@ -10,7 +10,7 @@ let package = Package(
         .library(name: "Fluent", targets: ["Fluent"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.16.0"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.36.0"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.50.0"),
     ],
     targets: [