diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 58f5d413feb7..4a28503e149b 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -110,8 +110,12 @@ rec {
       subversion
       tarball
       vim
-      tests-stdenv-gcc-stageCompare
       ;
+    tests.stdenv = {
+      inherit (nixpkgs'.tests.stdenv)
+        tests-stdenv-gcc-stageCompare
+        ;
+    };
   };
 
   tested =
@@ -163,7 +167,7 @@ rec {
           "nixos.tests.proxy"
           "nixos.tests.simple"
           "nixpkgs.jdk"
-          "nixpkgs.tests-stdenv-gcc-stageCompare"
+          "nixpkgs.tetsts.stdenv.tests-stdenv-gcc-stageCompare"
           "nixpkgs.opensshTest"
         ])
       ];
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index 6a8297fea01f..6e628997f0f8 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -452,6 +452,8 @@ in
     stdenv' = bootStdenv;
   };
 
+  tests-stdenv-gcc-stageCompare = pkgs.callPackage ./gcc-stageCompare.nix { };
+
   ensure-no-execve-in-setup-sh =
     derivation {
       name = "ensure-no-execve-in-setup-sh";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 445b5e695a8e..aa23847bf909 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11825,8 +11825,6 @@ with pkgs;
 
   twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
-  tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
-
   twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
 
   linphonePackages = recurseIntoAttrs (
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 5370cc028964..e7b89beed282 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -175,5 +175,5 @@ in
   xfsprogs = linux;
   xkeyboard_config = linux;
   zip = all;
-  tests-stdenv-gcc-stageCompare = linux;
+  tests.stdenv.tests-stdenv-gcc-stageCompare = linux;
 })