diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index fde2d44e3efe..27c80ed0b48b 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -2617,7 +2617,7 @@ runTests {
   testPackagesFromDirectoryRecursive = {
     expr = packagesFromDirectoryRecursive {
       callPackage = path: overrides: import path overrides;
-      directory = ./packages-from-directory;
+      directory = ./packages-from-directory/plain;
     };
     expected = {
       a = "a";
@@ -2642,7 +2642,7 @@ runTests {
   testPackagesFromDirectoryRecursiveTopLevelPackageNix = {
     expr = packagesFromDirectoryRecursive {
       callPackage = path: overrides: import path overrides;
-      directory = ./packages-from-directory/c;
+      directory = ./packages-from-directory/plain/c;
     };
     expected = "c";
   };
diff --git a/lib/tests/packages-from-directory/a.nix b/lib/tests/packages-from-directory/plain/a.nix
similarity index 100%
rename from lib/tests/packages-from-directory/a.nix
rename to lib/tests/packages-from-directory/plain/a.nix
diff --git a/lib/tests/packages-from-directory/b.nix b/lib/tests/packages-from-directory/plain/b.nix
similarity index 100%
rename from lib/tests/packages-from-directory/b.nix
rename to lib/tests/packages-from-directory/plain/b.nix
diff --git a/lib/tests/packages-from-directory/c/my-extra-feature.patch b/lib/tests/packages-from-directory/plain/c/my-extra-feature.patch
similarity index 100%
rename from lib/tests/packages-from-directory/c/my-extra-feature.patch
rename to lib/tests/packages-from-directory/plain/c/my-extra-feature.patch
diff --git a/lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix b/lib/tests/packages-from-directory/plain/c/not-a-namespace/not-a-package.nix
similarity index 100%
rename from lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix
rename to lib/tests/packages-from-directory/plain/c/not-a-namespace/not-a-package.nix
diff --git a/lib/tests/packages-from-directory/c/package.nix b/lib/tests/packages-from-directory/plain/c/package.nix
similarity index 100%
rename from lib/tests/packages-from-directory/c/package.nix
rename to lib/tests/packages-from-directory/plain/c/package.nix
diff --git a/lib/tests/packages-from-directory/c/support-definitions.nix b/lib/tests/packages-from-directory/plain/c/support-definitions.nix
similarity index 100%
rename from lib/tests/packages-from-directory/c/support-definitions.nix
rename to lib/tests/packages-from-directory/plain/c/support-definitions.nix
diff --git a/lib/tests/packages-from-directory/my-namespace/d.nix b/lib/tests/packages-from-directory/plain/my-namespace/d.nix
similarity index 100%
rename from lib/tests/packages-from-directory/my-namespace/d.nix
rename to lib/tests/packages-from-directory/plain/my-namespace/d.nix
diff --git a/lib/tests/packages-from-directory/my-namespace/e.nix b/lib/tests/packages-from-directory/plain/my-namespace/e.nix
similarity index 100%
rename from lib/tests/packages-from-directory/my-namespace/e.nix
rename to lib/tests/packages-from-directory/plain/my-namespace/e.nix
diff --git a/lib/tests/packages-from-directory/my-namespace/f/package.nix b/lib/tests/packages-from-directory/plain/my-namespace/f/package.nix
similarity index 100%
rename from lib/tests/packages-from-directory/my-namespace/f/package.nix
rename to lib/tests/packages-from-directory/plain/my-namespace/f/package.nix
diff --git a/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix b/lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/g.nix
similarity index 100%
rename from lib/tests/packages-from-directory/my-namespace/my-sub-namespace/g.nix
rename to lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/g.nix
diff --git a/lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix b/lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/h.nix
similarity index 100%
rename from lib/tests/packages-from-directory/my-namespace/my-sub-namespace/h.nix
rename to lib/tests/packages-from-directory/plain/my-namespace/my-sub-namespace/h.nix