diff --git a/.gitea/workflows/mcp-tests.yml b/.gitea/workflows/mcp-tests.yml
index 17dda9e..b6802e1 100644
--- a/.gitea/workflows/mcp-tests.yml
+++ b/.gitea/workflows/mcp-tests.yml
@@ -21,4 +21,4 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run MCP lint/format/tests via nix-shell
-        run: ./scripts/mcp-server/run-tests.sh
+        run: nix run .#mcp-tests
diff --git a/parts/packages.nix b/parts/packages.nix
index 8af8bce..13950a7 100644
--- a/parts/packages.nix
+++ b/parts/packages.nix
@@ -26,11 +26,25 @@
           exec ${mcpPython}/bin/python -m mcp_server.server
         '';
       };
+      mcpTests = pkgs.writeShellApplication {
+        name = "mcp-tests";
+        runtimeInputs = with pkgs.python3Packages; [
+          black
+          click
+          mypy
+          pytest
+          ruff
+        ];
+        text = ''
+          exec bash ${inputs.self}/scripts/mcp-server/run-tests.sh "$@"
+        '';
+      };
     in
     {
       packages = (inputs.jawz-scripts.packages.${system} or { }) // {
         emacs-vm = inputs.self.nixosConfigurations.emacs.config.system.build.vm;
         vps-linode = inputs.self.nixosConfigurations.vps.config.system.build.images.linode;
+        mcp-tests = mcpTests;
         nixos-mcp = nixosMcp;
         nixos-mcp-server = mcpServerPkg;
       };