diff --git a/.github/workflows/standard-go-test.yml b/.github/workflows/standard-go-test.yml
new file mode 100644
index 0000000..9788981
--- /dev/null
+++ b/.github/workflows/standard-go-test.yml
@@ -0,0 +1,12 @@
+name: Standard Test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  call-standard-test:
+    name: Test
+    uses: gobuffalo/.github/.github/workflows/go-test.yml@v1
+    secrets: inherit
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index bfadd86..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Tests
-on: [push]
-jobs:
-
-  tests-on:
-    name: ${{matrix.go-version}} ${{matrix.os}}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [1.16.x, 1.17.x]
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
-    - name: Test
-      run: |
-        go test -race ./...
-
-