diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
deleted file mode 100644
index cac8241f..00000000
--- a/.github/workflows/rustfmt.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: rustfmt
-
-on:
-  pull_request:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  rustfmt:
-    runs-on: ubuntu-latest
-    container: rustlang/rust:nightly
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Run cargo-fmt
-      run: cargo fmt --check
diff --git a/.github/workflows/buildtest.yml b/.github/workflows/test.yml
similarity index 96%
rename from .github/workflows/buildtest.yml
rename to .github/workflows/test.yml
index d08c91ae..29d37f0a 100644
--- a/.github/workflows/buildtest.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 # Ideally this should be replaced with a call out to Murdock; until that is
 # practical, building representative examples.
 
-name: build-test
+name: test
 
 on:
   pull_request:
@@ -141,3 +141,13 @@ jobs:
           echo "::endgroup::"
         done
         echo "::echo ::off"
+
+  rustfmt:
+    runs-on: ubuntu-latest
+    container: rustlang/rust:nightly
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Run cargo-fmt
+      run: cargo fmt --check