diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
index 2ea88072155..4b2a876323f 100644
--- a/packaging/dev-shell.nix
+++ b/packaging/dev-shell.nix
@@ -86,10 +86,11 @@ in {
     ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (lib.hiPrio pkgs.buildPackages.clang-tools);
 
   buildInputs = attrs.buildInputs or []
-    ++ [
-      pkgs.gtest
-      pkgs.rapidcheck
-    ]
+    ++ pkgs.nixComponents.nix-util.buildInputs
+    ++ pkgs.nixComponents.nix-store.buildInputs
+    ++ pkgs.nixComponents.nix-fetchers.buildInputs
+    ++ pkgs.nixComponents.nix-expr.buildInputs
+    ++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
     ++ lib.optional havePerl pkgs.perl
     ;
 })
diff --git a/src/libstore-tests/package.nix b/src/libstore-tests/package.nix
index 5b2fd108beb..3704d8c5ce8 100644
--- a/src/libstore-tests/package.nix
+++ b/src/libstore-tests/package.nix
@@ -38,15 +38,19 @@ mkMesonExecutable (finalAttrs: {
     (fileset.fileFilter (file: file.hasExt "hh") ./.)
   ];
 
-  buildInputs = [
-    nix-store
-    nix-store-c
-    nix-store-test-support
+  # Hack for sake of the dev shell
+  passthru.externalBuildInputs = [
     sqlite
     rapidcheck
     gtest
   ];
 
+  buildInputs = finalAttrs.passthru.externalBuildInputs ++ [
+    nix-store
+    nix-store-c
+    nix-store-test-support
+  ];
+
   preConfigure =
     # "Inline" .version so it's not a symlink, and includes the suffix.
     # Do the meson utils, without modification.