diff --git a/pkgs/shells/elvish/default.nix b/pkgs/by-name/el/elvish/package.nix
similarity index 63%
rename from pkgs/shells/elvish/default.nix
rename to pkgs/by-name/el/elvish/package.nix
index 1bd0c138c9c0..0069dad4f0c6 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/by-name/el/elvish/package.nix
@@ -1,13 +1,12 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
-, runCommand
+, callPackage
 }:
 
 let
   pname = "elvish";
   version = "0.19.2";
-  shellPath = "/bin/elvish";
 in
 buildGoModule {
   inherit pname version;
@@ -32,26 +31,12 @@ buildGoModule {
   strictDeps = true;
 
   doCheck = false;
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out${shellPath} -c "
-      fn expect {|key expected|
-        var actual = \$buildinfo[\$key]
-        if (not-eq \$actual \$expected) {
-          fail '\$buildinfo['\$key']: expected '(to-string \$expected)', got '(to-string \$actual)
-        }
-      }
-
-      expect version ${version}
-    "
-
-    runHook postInstallCheck
-  '';
 
   passthru = {
-    inherit shellPath;
+    shellPath = "/bin/elvish";
+    tests = {
+      expectVersion = callPackage ./tests/expect-version.nix { };
+    };
   };
 
   meta = {
@@ -63,6 +48,6 @@ buildGoModule {
       status, it is already suitable for most daily interactive use.
     '';
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
+    maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }
diff --git a/pkgs/by-name/el/elvish/tests/expect-version.elv b/pkgs/by-name/el/elvish/tests/expect-version.elv
new file mode 100644
index 000000000000..72f8c081f61b
--- /dev/null
+++ b/pkgs/by-name/el/elvish/tests/expect-version.elv
@@ -0,0 +1,8 @@
+fn expect {|key expected|
+  var actual = $buildinfo[$key]
+  if (not-eq $actual $expected) {
+    fail '$buildinfo['$key']: expected '(to-string $expected)', got '(to-string $actual)
+  }
+}
+
+expect version @version@
diff --git a/pkgs/by-name/el/elvish/tests/expect-version.nix b/pkgs/by-name/el/elvish/tests/expect-version.nix
new file mode 100644
index 000000000000..406f2131199d
--- /dev/null
+++ b/pkgs/by-name/el/elvish/tests/expect-version.nix
@@ -0,0 +1,25 @@
+{ lib
+, stdenv
+, elvish
+, substituteAll
+}:
+
+stdenv.mkDerivation {
+  pname = "elvish-simple-test";
+  inherit (elvish) version;
+
+  nativeBuildInputs = [ elvish ];
+
+  dontInstall = true;
+
+  buildCommand = ''
+    elvish ${substituteAll {
+      src = ./expect-version.elv;
+      inherit (elvish) version;
+    }}
+
+    touch $out
+  '';
+
+  meta.timeout = 10;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e86cbda96213..a2a8b29b5b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3749,8 +3749,6 @@ with pkgs;
 
   sedutil = callPackage ../tools/security/sedutil { };
 
-  elvish = callPackage ../shells/elvish { };
-
   emplace = callPackage ../tools/package-management/emplace { };
 
   enchive = callPackage ../tools/security/enchive { };