diff --git a/.github/workflows/maintests.yml b/.github/workflows/maintests.yml
index 099ad866..f181993f 100644
--- a/.github/workflows/maintests.yml
+++ b/.github/workflows/maintests.yml
@@ -10,7 +10,7 @@ on:
       - 'tox.ini'
       - '.github/workflows/maintests.yml'
       - '.github/workflows/prtests.yml'
-      - '.github/workflows/release.yml' 
+      - '.github/workflows/release.yml'
 jobs:
   build:
 
@@ -29,13 +29,11 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - name: Install tox and any other packages
-        run: | 
+        run: |
           python -m pip install --upgrade pip
           pip install --upgrade -r requirements.dev.txt
-      - name: Run format check
-        run: tox -e format
-      - name: Run lint check
-        run: tox -e lint-weak-check
+      - name: Run lint/format/mypy check
+        run: tox -e pre-commit
       - name: Check build_helper.py hordelib imports have no breaking dependency changes
         run: tox -e test-build-helper
       - name: Build unit test environment, confirm CUDA is available on host
diff --git a/.github/workflows/prtests.yml b/.github/workflows/prtests.yml
index 60ec0f24..80b0b33d 100644
--- a/.github/workflows/prtests.yml
+++ b/.github/workflows/prtests.yml
@@ -13,7 +13,7 @@ on:
       - 'tox.ini'
       - '.github/workflows/maintests.yml'
       - '.github/workflows/prtests.yml'
-      - '.github/workflows/release.yml' 
+      - '.github/workflows/release.yml'
 jobs:
   build:
 
@@ -34,13 +34,11 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
       - name: Install tox and any other packages
-        run: | 
+        run: |
           python -m pip install --upgrade pip
           pip install --upgrade -r requirements.dev.txt
-      - name: Run format check
-        run: tox -e format
-      - name: Run lint check
-        run: tox -e lint-weak-check
+      - name: Run lint/format/mypy check
+        run: tox -e pre-commit
       - name: Check build_helper.py hordelib imports have no breaking dependency changes
         run: tox -e test-build-helper
       - name: Build unit test environment, confirm CUDA is available on host