diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/by-name/go/gotestwaf/package.nix
similarity index 79%
rename from pkgs/tools/security/gotestwaf/default.nix
rename to pkgs/by-name/go/gotestwaf/package.nix
index 32797408a874..747ee15bf070 100644
--- a/pkgs/tools/security/gotestwaf/default.nix
+++ b/pkgs/by-name/go/gotestwaf/package.nix
@@ -2,8 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  gotestwaf,
-  testers,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -19,8 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4=";
 
-  # Some tests require networking as of v0.4.0
-  doCheck = false;
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   ldflags = [
     "-w"
@@ -28,11 +26,12 @@ buildGoModule rec {
     "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    command = "gotestwaf --version";
-    package = gotestwaf;
-    version = "v${version}";
-  };
+  # Tests require network access
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
 
   meta = with lib; {
     description = "Tool for API and OWASP attack simulation";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b66b1ed67b82..b73a821d3097 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18105,10 +18105,6 @@ with pkgs;
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  gotestwaf = callPackage ../tools/security/gotestwaf {
-    buildGoModule = buildGo123Module;
-  };
-
   gotrue = callPackage ../tools/security/gotrue { };
 
   gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { };