diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/by-name/jo/journalwatch/package.nix
similarity index 54%
rename from pkgs/tools/system/journalwatch/default.nix
rename to pkgs/by-name/jo/journalwatch/package.nix
index 0959e6166a0d..afd2a3ce3681 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/pkgs/by-name/jo/journalwatch/package.nix
@@ -1,39 +1,40 @@
-{ lib, buildPythonPackage, fetchFromGitHub, systemd, pytest }:
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
 
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "journalwatch";
   version = "1.1.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "The-Compiler";
-    repo = pname;
-    rev = "v${version}";
+    repo = "journalwatch";
+    rev = "refs/tags/v${version}";
     hash = "sha512-60+ewzOIox2wsQFXMAgD7XN+zvPA1ScPz6V4MB5taVDhqCxUTMVOxodf+4AMhxtNQloXZ3ye7/0bjh1NPDjxQg==";
   };
 
   # can be removed post 1.1.0
   postPatch = ''
     substituteInPlace test_journalwatch.py \
-      --replace "U Thu Jan  1 00:00:00 1970 prio foo [1337]" "U Thu Jan  1 00:00:00 1970 pprio foo [1337]"
+      --replace-fail "U Thu Jan  1 00:00:00 1970 prio foo [1337]" "U Thu Jan  1 00:00:00 1970 pprio foo [1337]"
   '';
 
+  build-system = with python3Packages; [ setuptools ];
 
-  doCheck = true;
-  nativeCheckInputs = [ pytest ];
-  checkPhase = ''
-    pytest
-  '';
+  dependencies = with python3Packages; [ systemd ];
 
-  propagatedBuildInputs = [
-    systemd
-  ];
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "journalwatch" ];
 
   meta = with lib; {
     description = "A tool to find error messages in the systemd journal";
-    mainProgram = "journalwatch";
     homepage = "https://github.com/The-Compiler/journalwatch";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ florianjacob ];
+    mainProgram = "journalwatch";
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e94ab510995..150965f1d205 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6100,10 +6100,6 @@ self: super: with self; {
 
   joserfc = callPackage ../development/python-modules/joserfc { };
 
-  journalwatch = callPackage ../tools/system/journalwatch {
-    inherit (self) systemd pytest;
-  };
-
   jplephem = callPackage ../development/python-modules/jplephem { };
 
   jproperties = callPackage ../development/python-modules/jproperties { };