diff --git a/pkgs/by-name/pa/pantalaimon-headless/package.nix b/pkgs/by-name/pa/pantalaimon-headless/package.nix
new file mode 100644
index 000000000000..8d59f45f1335
--- /dev/null
+++ b/pkgs/by-name/pa/pantalaimon-headless/package.nix
@@ -0,0 +1,11 @@
+{
+  pantalaimon,
+  ...
+}@args:
+
+pantalaimon.override (
+  {
+    enableDbusUi = false;
+  }
+  // removeAttrs args [ "pantalaimon" ]
+)
diff --git a/pkgs/by-name/pa/pantalaimon/package.nix b/pkgs/by-name/pa/pantalaimon/package.nix
index d4dccd139d94..1ebed7bc878a 100644
--- a/pkgs/by-name/pa/pantalaimon/package.nix
+++ b/pkgs/by-name/pa/pantalaimon/package.nix
@@ -77,7 +77,8 @@ python3Packages.buildPythonApplication rec {
   ];
 
   # darwin has difficulty communicating with server, fails some integration tests
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # Tests are incompatible with pytest>=8 and Python 3.13
+  doCheck = !stdenv.hostPlatform.isDarwin && python3Packages.pythonOlder "3.13";
 
   postInstall = ''
     installManPage docs/man/*.[1-9]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c44bef50ed6..985f3afd5e98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9721,10 +9721,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  pantalaimon-headless = pantalaimon.override {
-    enableDbusUi = false;
-  };
-
   parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
 
   pdfpc = callPackage ../applications/misc/pdfpc {