diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix
index 29c2c7faa680..7b3ecdb894e0 100644
--- a/pkgs/by-name/ae/aerospace/package.nix
+++ b/pkgs/by-name/ae/aerospace/package.nix
@@ -39,7 +39,10 @@ stdenv.mkDerivation {
     installShellCompletion --zsh  shell-completion/zsh/_aerospace
   '';
 
-  passthru.tests.can-print-version = [ versionCheckHook ];
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
 
   passthru.updateScript = gitUpdater {
     url = "https://github.com/nikitabobko/AeroSpace.git";
diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix
index 9ed753ef05eb..3cdde4b2e995 100644
--- a/pkgs/by-name/as/astroterm/package.nix
+++ b/pkgs/by-name/as/astroterm/package.nix
@@ -31,13 +31,17 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     xxd
-    versionCheckHook
   ];
   buildInputs = [
     argtable
     ncurses
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
   postPatch = ''
     mkdir -p data
     ln -s ${finalAttrs.bsc5File} data/bsc5
diff --git a/pkgs/by-name/cl/cloudpan189-go/package.nix b/pkgs/by-name/cl/cloudpan189-go/package.nix
index e3f61182d052..f3259db43663 100644
--- a/pkgs/by-name/cl/cloudpan189-go/package.nix
+++ b/pkgs/by-name/cl/cloudpan189-go/package.nix
@@ -22,6 +22,7 @@ buildGo122Module rec {
     '';
   };
 
+  doInstallCheck = true;
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix
index 10d48b0fc4ce..39f97281d73b 100644
--- a/pkgs/by-name/de/deepsource/package.nix
+++ b/pkgs/by-name/de/deepsource/package.nix
@@ -48,6 +48,8 @@ buildGoModule rec {
       --zsh <($out/bin/deepsource completion zsh)
   '';
 
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "version" ];
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix
index de64e6eb852e..7260bf80d51e 100644
--- a/pkgs/by-name/en/envision-unwrapped/package.nix
+++ b/pkgs/by-name/en/envision-unwrapped/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustPlatform.cargoSetupHook
     rustc
-    versionCheckHook
     wrapGAppsHook4
   ];
 
@@ -87,6 +86,14 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
+  # FIXME: error when running `env -i envision`:
+  # "HOME env var not defined: NotPresent"
+  doInstallCheck = false;
+  versionCheckProgram = "${placeholder "out"}/bin/envision";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
   postInstall = ''
     wrapProgram $out/bin/envision \
       --prefix PATH : "${lib.makeBinPath [ gdb ]}"
diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix
index 30e4006a656d..75e97c841c7d 100644
--- a/pkgs/by-name/go/gollama/package.nix
+++ b/pkgs/by-name/go/gollama/package.nix
@@ -16,6 +16,11 @@ buildGoModule rec {
     hash = "sha256-7wCBflX34prZJl4HhZUU2a2qHxaBs1fMKHpwE0vX1GE=";
   };
 
+  postPatch = ''
+    substituteInPlace main.go \
+      --replace-fail 'Version = "1.28.0"' 'Version = "${version}"'
+  '';
+
   vendorHash = "sha256-Y5yg54em+vqoWXxS3JVQVPEM+fLXgoblmY+48WpxSCQ=";
 
   doCheck = false;
@@ -25,7 +30,10 @@ buildGoModule rec {
     "-w"
   ];
 
-  nativeInputChecks = [
+  # FIXME: error when running `env -i gollama`:
+  # "Error initializing logging: $HOME is not defined"
+  doInstallCheck = false;
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
 
diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index a322f863ab05..21c02e1dc022 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -26,6 +26,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeCheckInputs = [
     git
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
 
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index 5b20425a25e1..155251f82dc0 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -70,7 +70,8 @@ python3Packages.buildPythonApplication rec {
     done
   '';
 
-  nativeCheckInputs = [
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
   versionCheckProgramArg = [ "--version" ];
diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix
index 899f84b019a3..f75292ff8575 100644
--- a/pkgs/by-name/nv/nvitop/package.nix
+++ b/pkgs/by-name/nv/nvitop/package.nix
@@ -23,7 +23,8 @@ python3Packages.buildPythonApplication rec {
     nvidia-ml-py
   ];
 
-  nativeCheckInputs = [
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
   versionCheckProgramArg = [ "--version" ];
diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix
index 0315f9600493..51046a403ff2 100644
--- a/pkgs/by-name/up/upbound/package.nix
+++ b/pkgs/by-name/up/upbound/package.nix
@@ -50,6 +50,10 @@ stdenvNoCC.mkDerivation {
     installShellCompletion --bash --name up <(echo complete -C up up)
   '';
 
+  # FIXME: error when running `env -i up`:
+  # "up: error: $HOME is not defined"
+  doInstallCheck = false;
+  versionCheckProgram = "${placeholder "out"}/bin/up";
   versionCheckProgramArg = "version";
 
   nativeInstallCheckInputs = [
@@ -63,10 +67,6 @@ stdenvNoCC.mkDerivation {
     "${version-channel}"
   ];
 
-  passthru.tests = {
-    versionCheck = versionCheckHook;
-  };
-
   meta = {
     description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
     homepage = "https://upbound.io";