diff --git a/tests/functional2/lang/fetchTree-negative/eval-fail.err.exp b/tests/functional2/lang/builtins.fetchtree/eval-fail-negative.err.exp
similarity index 100%
rename from tests/functional2/lang/fetchTree-negative/eval-fail.err.exp
rename to tests/functional2/lang/builtins.fetchtree/eval-fail-negative.err.exp
diff --git a/tests/functional2/lang/fetchTree-negative/in.nix b/tests/functional2/lang/builtins.fetchtree/in-negative.nix
similarity index 51%
rename from tests/functional2/lang/fetchTree-negative/in.nix
rename to tests/functional2/lang/builtins.fetchtree/in-negative.nix
index 90bcab5d8..cc6384099 100644
--- a/tests/functional2/lang/fetchTree-negative/in.nix
+++ b/tests/functional2/lang/builtins.fetchtree/in-negative.nix
@@ -1,5 +1,5 @@
 builtins.fetchTree {
   type = "file";
-  url = "file://eval-fail-fetchTree-negative.nix";
+  url = "file://in-negative.nix";
   owner = -1;
 }
diff --git a/tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp b/tests/functional2/lang/builtins.flakeRefToString/eval-fail-negative-integer.err.exp
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp
rename to tests/functional2/lang/builtins.flakeRefToString/eval-fail-negative-integer.err.exp
diff --git a/tests/functional2/lang/flake-ref-to-string/eval-okay.out.exp b/tests/functional2/lang/builtins.flakeRefToString/eval-okay.out.exp
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/eval-okay.out.exp
rename to tests/functional2/lang/builtins.flakeRefToString/eval-okay.out.exp
diff --git a/tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix b/tests/functional2/lang/builtins.flakeRefToString/in-negative-integer.nix
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix
rename to tests/functional2/lang/builtins.flakeRefToString/in-negative-integer.nix
diff --git a/tests/functional2/lang/flake-ref-to-string/in.nix b/tests/functional2/lang/builtins.flakeRefToString/in.nix
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/in.nix
rename to tests/functional2/lang/builtins.flakeRefToString/in.nix
diff --git a/tests/functional2/lang/not-throws/eval-fail.err.exp b/tests/functional2/lang/builtins.throw/eval-fail-throw-not.err.exp
similarity index 100%
rename from tests/functional2/lang/not-throws/eval-fail.err.exp
rename to tests/functional2/lang/builtins.throw/eval-fail-throw-not.err.exp
diff --git a/tests/functional2/lang/not-throws/in.nix b/tests/functional2/lang/builtins.throw/in-throw-not.nix
similarity index 100%
rename from tests/functional2/lang/not-throws/in.nix
rename to tests/functional2/lang/builtins.throw/in-throw-not.nix
diff --git a/tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp b/tests/functional2/lang/function-recursion/eval-fail-infrec.err.exp
similarity index 100%
rename from tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp
rename to tests/functional2/lang/function-recursion/eval-fail-infrec.err.exp
diff --git a/tests/functional2/lang/mutual-recursion/eval-fail.err.exp b/tests/functional2/lang/function-recursion/eval-fail-mutrec.err.exp
similarity index 100%
rename from tests/functional2/lang/mutual-recursion/eval-fail.err.exp
rename to tests/functional2/lang/function-recursion/eval-fail-mutrec.err.exp
diff --git a/tests/functional2/lang/infinite-recursion-lambda/in.nix b/tests/functional2/lang/function-recursion/in-infrec.nix
similarity index 100%
rename from tests/functional2/lang/infinite-recursion-lambda/in.nix
rename to tests/functional2/lang/function-recursion/in-infrec.nix
diff --git a/tests/functional2/lang/mutual-recursion/in.nix b/tests/functional2/lang/function-recursion/in-mutrec.nix
similarity index 100%
rename from tests/functional2/lang/mutual-recursion/in.nix
rename to tests/functional2/lang/function-recursion/in-mutrec.nix
diff --git a/tests/functional2/lang/nonexist-path/eval-fail.err.exp b/tests/functional2/lang/path/eval-fail-nonexist.err.exp
similarity index 100%
rename from tests/functional2/lang/nonexist-path/eval-fail.err.exp
rename to tests/functional2/lang/path/eval-fail-nonexist.err.exp
diff --git a/tests/functional2/lang/path-string-interpolation/eval-okay.out.exp b/tests/functional2/lang/path/eval-okay-string-interpolation.out.exp
similarity index 100%
rename from tests/functional2/lang/path-string-interpolation/eval-okay.out.exp
rename to tests/functional2/lang/path/eval-okay-string-interpolation.out.exp
diff --git a/tests/functional2/lang/nonexist-path/in.nix b/tests/functional2/lang/path/in-nonexist.nix
similarity index 100%
rename from tests/functional2/lang/nonexist-path/in.nix
rename to tests/functional2/lang/path/in-nonexist.nix
diff --git a/tests/functional2/lang/path-string-interpolation/in.nix b/tests/functional2/lang/path/in-string-interpolation.nix
similarity index 100%
rename from tests/functional2/lang/path-string-interpolation/in.nix
rename to tests/functional2/lang/path/in-string-interpolation.nix
diff --git a/tests/functional2/lang/path-slash/in.nix b/tests/functional2/lang/path/in-trailing-slash.nix
similarity index 100%
rename from tests/functional2/lang/path-slash/in.nix
rename to tests/functional2/lang/path/in-trailing-slash.nix
diff --git a/tests/functional2/lang/path-slash/parse-fail.err.exp b/tests/functional2/lang/path/parse-fail-trailing-slash.err.exp
similarity index 100%
rename from tests/functional2/lang/path-slash/parse-fail.err.exp
rename to tests/functional2/lang/path/parse-fail-trailing-slash.err.exp