diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a9c239b..de2048e3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,8 @@ jobs:
     - name: Byte compilation
       run: emacs --eval "(setq byte-compile-error-on-warn (>= emacs-major-version 26))" -L . --batch -f batch-byte-compile ./*.el
     - name: Tests
-      run: nix shell ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c make -C test test-batch
+      run: nix shell ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c ./makem.sh test -vv --compile-batch
     # This is currently for information only, since a lot of docstrings need fixing up
     - name: Checkdoc
-      run: make -C test checkdoc || true
+      run: make lint-checkdoc || true
+    # TODO: Run other makem.sh lints