diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/by-name/it/itstool/package.nix
similarity index 69%
rename from pkgs/development/tools/misc/itstool/default.nix
rename to pkgs/by-name/it/itstool/package.nix
index c8889d33401b8..ba44b41da0487 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/by-name/it/itstool/package.nix
@@ -1,7 +1,9 @@
-{ stdenv
-, lib
-, fetchurl
-, python3
+{
+  stdenv,
+  lib,
+  fetchurl,
+  python3Packages,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,23 +18,22 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
-    python3
-    python3.pkgs.wrapPython
-  ];
-
-  buildInputs = [
-    python3
-    python3.pkgs.libxml2
+    python3Packages.python
+    python3Packages.libxml2
+    python3Packages.wrapPython
   ];
 
   pythonPath = [
-    python3.pkgs.libxml2
+    python3Packages.libxml2
   ];
 
   postFixup = ''
     wrapPythonPrograms
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     homepage = "https://itstool.org/";
     description = "XML to PO and back again";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a90940e270948..84303b22769ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18228,8 +18228,6 @@ with pkgs;
 
   iozone = callPackage ../development/tools/misc/iozone { };
 
-  itstool = callPackage ../development/tools/misc/itstool { };
-
   jacoco = callPackage ../development/tools/analysis/jacoco { };
 
   jake = callPackage ../development/tools/jake { };