diff --git a/tests/functional/lang/eval-fail-abort.err.exp b/tests/functional2/lang/abort/eval-fail.err.exp
similarity index 85%
rename from tests/functional/lang/eval-fail-abort.err.exp
rename to tests/functional2/lang/abort/eval-fail.err.exp
index 8093e5fe7..0f895772d 100644
--- a/tests/functional/lang/eval-fail-abort.err.exp
+++ b/tests/functional2/lang/abort/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'abort' builtin
-         at /pwd/eval-fail-abort.nix:1:14:
+         at /pwd/in.nix:1:14:
             1| if true then abort "this should fail" else 1
              |              ^
             2|
diff --git a/tests/functional/lang/eval-fail-abort.nix b/tests/functional2/lang/abort/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-abort.nix
rename to tests/functional2/lang/abort/in.nix
diff --git a/tests/functional/lang/eval-fail-assert.err.exp b/tests/functional2/lang/assert/eval-fail.err.exp
similarity index 75%
rename from tests/functional/lang/eval-fail-assert.err.exp
rename to tests/functional2/lang/assert/eval-fail.err.exp
index b83c8d6f9..ad27f2510 100644
--- a/tests/functional/lang/eval-fail-assert.err.exp
+++ b/tests/functional2/lang/assert/eval-fail.err.exp
@@ -1,20 +1,20 @@
 error:
        … from call site
-         at /pwd/eval-fail-assert.nix:4:1:
+         at /pwd/in.nix:4:1:
             3| in
             4| x "x"
              | ^
             5|
 
        … while calling 'x'
-         at /pwd/eval-fail-assert.nix:2:7:
+         at /pwd/in.nix:2:7:
             1| let
             2|   x = arg: assert arg == "y"; 123;
              |       ^
             3| in
 
        error: assertion failed
-       at /pwd/eval-fail-assert.nix:2:12:
+       at /pwd/in.nix:2:12:
             1| let
             2|   x = arg: assert arg == "y"; 123;
              |            ^
diff --git a/tests/functional/lang/eval-fail-assert.nix b/tests/functional2/lang/assert/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-assert.nix
rename to tests/functional2/lang/assert/in.nix
diff --git a/tests/functional/lang/eval-fail-attr-name-type.err.exp b/tests/functional2/lang/attr-name-type/eval-fail.err.exp
similarity index 75%
rename from tests/functional/lang/eval-fail-attr-name-type.err.exp
rename to tests/functional2/lang/attr-name-type/eval-fail.err.exp
index ffc0604a6..eed1b2aa9 100644
--- a/tests/functional/lang/eval-fail-attr-name-type.err.exp
+++ b/tests/functional2/lang/attr-name-type/eval-fail.err.exp
@@ -1,20 +1,20 @@
 error:
        … while evaluating the attribute 'puppy."${...}"'
-         at /pwd/eval-fail-attr-name-type.nix:3:5:
+         at /pwd/in.nix:3:5:
             2|   attrs = {
             3|     puppy.doggy = {};
              |     ^
             4|   };
 
        … while evaluating an attribute name
-         at /pwd/eval-fail-attr-name-type.nix:7:17:
+         at /pwd/in.nix:7:17:
             6| in
             7|   attrs.puppy.${key}
              |                 ^
             8|
 
        error: expected a string but found an integer: 1
-       at /pwd/eval-fail-attr-name-type.nix:7:17:
+       at /pwd/in.nix:7:17:
             6| in
             7|   attrs.puppy.${key}
              |                 ^
diff --git a/tests/functional/lang/eval-fail-attr-name-type.nix b/tests/functional2/lang/attr-name-type/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-attr-name-type.nix
rename to tests/functional2/lang/attr-name-type/in.nix
diff --git a/tests/functional/lang/eval-fail-blackhole.err.exp b/tests/functional2/lang/blackhole/eval-fail.err.exp
similarity index 72%
rename from tests/functional/lang/eval-fail-blackhole.err.exp
rename to tests/functional2/lang/blackhole/eval-fail.err.exp
index 62fbf21a2..c2c0ff49c 100644
--- a/tests/functional/lang/eval-fail-blackhole.err.exp
+++ b/tests/functional2/lang/blackhole/eval-fail.err.exp
@@ -1,20 +1,20 @@
 error:
        … while evaluating x
-         at /pwd/eval-fail-blackhole.nix:5:1:
+         at /pwd/in.nix:5:1:
             4| in
             5| x
              | ^
             6|
 
        … while evaluating y
-         at /pwd/eval-fail-blackhole.nix:2:7:
+         at /pwd/in.nix:2:7:
             1| let
             2|   x = y;
              |       ^
             3|   y = x;
 
        error: infinite recursion encountered
-       at /pwd/eval-fail-blackhole.nix:2:7:
+       at /pwd/in.nix:2:7:
             1| let
             2|   x = y;
              |       ^
diff --git a/tests/functional/lang/eval-fail-blackhole.nix b/tests/functional2/lang/blackhole/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-blackhole.nix
rename to tests/functional2/lang/blackhole/in.nix
diff --git a/tests/functional/lang/eval-fail-call-primop.err.exp b/tests/functional2/lang/call-primop/eval-fail.err.exp
similarity index 83%
rename from tests/functional/lang/eval-fail-call-primop.err.exp
rename to tests/functional2/lang/call-primop/eval-fail.err.exp
index 7e9b7c7a2..923849dfe 100644
--- a/tests/functional/lang/eval-fail-call-primop.err.exp
+++ b/tests/functional2/lang/call-primop/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'length' builtin
-         at /pwd/eval-fail-call-primop.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.length 1
              | ^
             2|
diff --git a/tests/functional/lang/eval-fail-call-primop.nix b/tests/functional2/lang/call-primop/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-call-primop.nix
rename to tests/functional2/lang/call-primop/in.nix
diff --git a/tests/functional/lang/eval-fail-deepseq.err.exp b/tests/functional2/lang/deepseq/eval-fail.err.exp
similarity index 79%
rename from tests/functional/lang/eval-fail-deepseq.err.exp
rename to tests/functional2/lang/deepseq/eval-fail.err.exp
index b1dcb86d7..651fa0199 100644
--- a/tests/functional/lang/eval-fail-deepseq.err.exp
+++ b/tests/functional2/lang/deepseq/eval-fail.err.exp
@@ -1,18 +1,18 @@
 error:
        … while calling the 'deepSeq' builtin
-         at /pwd/eval-fail-deepseq.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.deepSeq { x = abort "foo"; } 456
              | ^
             2|
 
        … while evaluating the attribute 'x'
-         at /pwd/eval-fail-deepseq.nix:1:20:
+         at /pwd/in.nix:1:20:
             1| builtins.deepSeq { x = abort "foo"; } 456
              |                    ^
             2|
 
        … while calling the 'abort' builtin
-         at /pwd/eval-fail-deepseq.nix:1:24:
+         at /pwd/in.nix:1:24:
             1| builtins.deepSeq { x = abort "foo"; } 456
              |                        ^
             2|
diff --git a/tests/functional/lang/eval-fail-deepseq.nix b/tests/functional2/lang/deepseq/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-deepseq.nix
rename to tests/functional2/lang/deepseq/in.nix
diff --git a/tests/functional/lang/eval-fail-duplicate-traces.err.exp b/tests/functional2/lang/duplicate-traces/eval-fail.err.exp
similarity index 74%
rename from tests/functional/lang/eval-fail-duplicate-traces.err.exp
rename to tests/functional2/lang/duplicate-traces/eval-fail.err.exp
index 62d4a7657..f469e962c 100644
--- a/tests/functional/lang/eval-fail-duplicate-traces.err.exp
+++ b/tests/functional2/lang/duplicate-traces/eval-fail.err.exp
@@ -1,48 +1,48 @@
 error:
        … from call site
-         at /pwd/eval-fail-duplicate-traces.nix:9:3:
+         at /pwd/in.nix:9:3:
             8| in
             9|   throwAfter 2
              |   ^
            10|
 
        … while calling 'throwAfter'
-         at /pwd/eval-fail-duplicate-traces.nix:4:16:
+         at /pwd/in.nix:4:16:
             3| let
             4|   throwAfter = n:
              |                ^
             5|     if n > 0
 
        … from call site
-         at /pwd/eval-fail-duplicate-traces.nix:6:10:
+         at /pwd/in.nix:6:10:
             5|     if n > 0
             6|     then throwAfter (n - 1)
              |          ^
             7|     else throw "Uh oh!";
 
        … while calling 'throwAfter'
-         at /pwd/eval-fail-duplicate-traces.nix:4:16:
+         at /pwd/in.nix:4:16:
             3| let
             4|   throwAfter = n:
              |                ^
             5|     if n > 0
 
        … from call site
-         at /pwd/eval-fail-duplicate-traces.nix:6:10:
+         at /pwd/in.nix:6:10:
             5|     if n > 0
             6|     then throwAfter (n - 1)
              |          ^
             7|     else throw "Uh oh!";
 
        … while calling 'throwAfter'
-         at /pwd/eval-fail-duplicate-traces.nix:4:16:
+         at /pwd/in.nix:4:16:
             3| let
             4|   throwAfter = n:
              |                ^
             5|     if n > 0
 
        … caused by explicit throw
-         at /pwd/eval-fail-duplicate-traces.nix:7:10:
+         at /pwd/in.nix:7:10:
             6|     then throwAfter (n - 1)
             7|     else throw "Uh oh!";
              |          ^
diff --git a/tests/functional/lang/eval-fail-duplicate-traces.nix b/tests/functional2/lang/duplicate-traces/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-duplicate-traces.nix
rename to tests/functional2/lang/duplicate-traces/in.nix
diff --git a/tests/functional/lang/eval-fail-fetchTree-negative.err.exp b/tests/functional2/lang/fetchTree-negative/eval-fail.err.exp
similarity index 78%
rename from tests/functional/lang/eval-fail-fetchTree-negative.err.exp
rename to tests/functional2/lang/fetchTree-negative/eval-fail.err.exp
index 0474ecaac..5cc58868b 100644
--- a/tests/functional/lang/eval-fail-fetchTree-negative.err.exp
+++ b/tests/functional2/lang/fetchTree-negative/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'fetchTree' builtin
-         at /pwd/eval-fail-fetchTree-negative.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.fetchTree {
              | ^
             2|   type = "file";
diff --git a/tests/functional/lang/eval-fail-fetchTree-negative.nix b/tests/functional2/lang/fetchTree-negative/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-fetchTree-negative.nix
rename to tests/functional2/lang/fetchTree-negative/in.nix
diff --git a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp b/tests/functional2/lang/flake-ref-to-string-negative-integer/eval-fail.err.exp
similarity index 76%
rename from tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp
rename to tests/functional2/lang/flake-ref-to-string-negative-integer/eval-fail.err.exp
index 55d4a8228..fdb4a591a 100644
--- a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp
+++ b/tests/functional2/lang/flake-ref-to-string-negative-integer/eval-fail.err.exp
@@ -1,12 +1,12 @@
 error:
        … while calling the 'seq' builtin
-         at /pwd/eval-fail-flake-ref-to-string-negative-integer.nix:1:16:
+         at /pwd/in.nix:1:16:
             1| let n = -1; in builtins.seq n (builtins.flakeRefToString {
              |                ^
             2|   type  = "github";
 
        … while calling the 'flakeRefToString' builtin
-         at /pwd/eval-fail-flake-ref-to-string-negative-integer.nix:1:32:
+         at /pwd/in.nix:1:32:
             1| let n = -1; in builtins.seq n (builtins.flakeRefToString {
              |                                ^
             2|   type  = "github";
diff --git a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.nix b/tests/functional2/lang/flake-ref-to-string-negative-integer/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.nix
rename to tests/functional2/lang/flake-ref-to-string-negative-integer/in.nix
diff --git a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp b/tests/functional2/lang/foldlStrict-strict-op-application/eval-fail.err.exp
similarity index 72%
rename from tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
rename to tests/functional2/lang/foldlStrict-strict-op-application/eval-fail.err.exp
index 2bd983d3e..e273ff7b1 100644
--- a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp
+++ b/tests/functional2/lang/foldlStrict-strict-op-application/eval-fail.err.exp
@@ -1,34 +1,34 @@
 error:
        … while calling the 'foldl'' builtin
-         at /pwd/eval-fail-foldlStrict-strict-op-application.nix:2:1:
+         at /pwd/in.nix:2:1:
             1| # Tests that the result of applying op is forced even if the value is never used
             2| builtins.foldl'
              | ^
             3|   (_: f: f null)
 
        … while calling anonymous lambda
-         at /pwd/eval-fail-foldlStrict-strict-op-application.nix:3:7:
+         at /pwd/in.nix:3:7:
             2| builtins.foldl'
             3|   (_: f: f null)
              |       ^
             4|   null
 
        … from call site
-         at /pwd/eval-fail-foldlStrict-strict-op-application.nix:3:10:
+         at /pwd/in.nix:3:10:
             2| builtins.foldl'
             3|   (_: f: f null)
              |          ^
             4|   null
 
        … while calling anonymous lambda
-         at /pwd/eval-fail-foldlStrict-strict-op-application.nix:5:6:
+         at /pwd/in.nix:5:6:
             4|   null
             5|   [ (_: throw "Not the final value, but is still forced!") (_: 23) ]
              |      ^
             6|
 
        … caused by explicit throw
-         at /pwd/eval-fail-foldlStrict-strict-op-application.nix:5:9:
+         at /pwd/in.nix:5:9:
             4|   null
             5|   [ (_: throw "Not the final value, but is still forced!") (_: 23) ]
              |         ^
diff --git a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix b/tests/functional2/lang/foldlStrict-strict-op-application/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix
rename to tests/functional2/lang/foldlStrict-strict-op-application/in.nix
diff --git a/tests/functional/lang/eval-fail-fromJSON-overflowing.err.exp b/tests/functional2/lang/fromJSON-overflowing/eval-fail.err.exp
similarity index 80%
rename from tests/functional/lang/eval-fail-fromJSON-overflowing.err.exp
rename to tests/functional2/lang/fromJSON-overflowing/eval-fail.err.exp
index 29bfb105f..49b8bf8b7 100644
--- a/tests/functional/lang/eval-fail-fromJSON-overflowing.err.exp
+++ b/tests/functional2/lang/fromJSON-overflowing/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'fromJSON' builtin
-         at /pwd/eval-fail-fromJSON-overflowing.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.fromJSON ''{"attr": 18446744073709551615}''
              | ^
             2|
diff --git a/tests/functional/lang/eval-fail-fromJSON-overflowing.nix b/tests/functional2/lang/fromJSON-overflowing/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-fromJSON-overflowing.nix
rename to tests/functional2/lang/fromJSON-overflowing/in.nix
diff --git a/tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp b/tests/functional2/lang/fromTOML-timestamps/eval-fail.err.exp
similarity index 78%
rename from tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp
rename to tests/functional2/lang/fromTOML-timestamps/eval-fail.err.exp
index 18aae273e..a41111b0f 100644
--- a/tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp
+++ b/tests/functional2/lang/fromTOML-timestamps/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'fromTOML' builtin
-         at /pwd/eval-fail-fromTOML-timestamps.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.fromTOML ''
              | ^
             2|   key = "value"
diff --git a/tests/functional/lang/eval-fail-fromTOML-timestamps.nix b/tests/functional2/lang/fromTOML-timestamps/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-fromTOML-timestamps.nix
rename to tests/functional2/lang/fromTOML-timestamps/in.nix
diff --git a/tests/functional/lang/eval-fail-hashfile-missing.err.exp b/tests/functional2/lang/hashfile-missing/eval-fail.err.exp
similarity index 89%
rename from tests/functional/lang/eval-fail-hashfile-missing.err.exp
rename to tests/functional2/lang/hashfile-missing/eval-fail.err.exp
index d0a2866b6..e0a1de0c4 100644
--- a/tests/functional/lang/eval-fail-hashfile-missing.err.exp
+++ b/tests/functional2/lang/hashfile-missing/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'toString' builtin
-         at /pwd/eval-fail-hashfile-missing.nix:4:3:
+         at /pwd/in.nix:4:3:
             3| in
             4|   toString (builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"]))
              |   ^
diff --git a/tests/functional/lang/eval-fail-hashfile-missing.nix b/tests/functional2/lang/hashfile-missing/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-hashfile-missing.nix
rename to tests/functional2/lang/hashfile-missing/in.nix
diff --git a/tests/functional/lang/eval-fail-infinite-recursion-lambda.err.exp b/tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp
similarity index 65%
rename from tests/functional/lang/eval-fail-infinite-recursion-lambda.err.exp
rename to tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp
index 0dc2ff9b8..ba5d38491 100644
--- a/tests/functional/lang/eval-fail-infinite-recursion-lambda.err.exp
+++ b/tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp
@@ -1,30 +1,30 @@
 error:
        … from call site
-         at /pwd/eval-fail-infinite-recursion-lambda.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| (x: x x) (x: x x)
              | ^
             2|
 
        … while calling anonymous lambda
-         at /pwd/eval-fail-infinite-recursion-lambda.nix:1:2:
+         at /pwd/in.nix:1:2:
             1| (x: x x) (x: x x)
              |  ^
             2|
 
        … from call site
-         at /pwd/eval-fail-infinite-recursion-lambda.nix:1:5:
+         at /pwd/in.nix:1:5:
             1| (x: x x) (x: x x)
              |     ^
             2|
 
        … while calling anonymous lambda
-         at /pwd/eval-fail-infinite-recursion-lambda.nix:1:11:
+         at /pwd/in.nix:1:11:
             1| (x: x x) (x: x x)
              |           ^
             2|
 
        … from call site
-         at /pwd/eval-fail-infinite-recursion-lambda.nix:1:14:
+         at /pwd/in.nix:1:14:
             1| (x: x x) (x: x x)
              |              ^
             2|
@@ -32,7 +32,7 @@ error:
        (19997 duplicate frames omitted)
 
        error: stack overflow; max-call-depth exceeded
-       at /pwd/eval-fail-infinite-recursion-lambda.nix:1:14:
+       at /pwd/in.nix:1:14:
             1| (x: x x) (x: x x)
              |              ^
             2|
diff --git a/tests/functional/lang/eval-fail-infinite-recursion-lambda.nix b/tests/functional2/lang/infinite-recursion-lambda/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-infinite-recursion-lambda.nix
rename to tests/functional2/lang/infinite-recursion-lambda/in.nix
diff --git a/tests/functional/lang/eval-fail-list.err.exp b/tests/functional2/lang/list/eval-fail.err.exp
similarity index 71%
rename from tests/functional/lang/eval-fail-list.err.exp
rename to tests/functional2/lang/list/eval-fail.err.exp
index eb936bdc1..4de60e353 100644
--- a/tests/functional/lang/eval-fail-list.err.exp
+++ b/tests/functional2/lang/list/eval-fail.err.exp
@@ -1,5 +1,5 @@
 error: expected a list but found an integer: 8
-       at /pwd/eval-fail-list.nix:1:1:
+       at /pwd/in.nix:1:1:
             1| 8++1
              | ^
             2|
diff --git a/tests/functional/lang/eval-fail-list.nix b/tests/functional2/lang/list/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-list.nix
rename to tests/functional2/lang/list/in.nix
diff --git a/tests/functional/lang/eval-fail-mutual-recursion.err.exp b/tests/functional2/lang/mutual-recursion/eval-fail.err.exp
similarity index 76%
rename from tests/functional/lang/eval-fail-mutual-recursion.err.exp
rename to tests/functional2/lang/mutual-recursion/eval-fail.err.exp
index d65e5e5e4..77eb9bd7c 100644
--- a/tests/functional/lang/eval-fail-mutual-recursion.err.exp
+++ b/tests/functional2/lang/mutual-recursion/eval-fail.err.exp
@@ -1,20 +1,20 @@
 error:
        … from call site
-         at /pwd/eval-fail-mutual-recursion.nix:36:3:
+         at /pwd/in.nix:36:3:
            35| in
            36|   throwAfterA true 10
              |   ^
            37|
 
        … while calling 'throwAfterA'
-         at /pwd/eval-fail-mutual-recursion.nix:29:26:
+         at /pwd/in.nix:29:26:
            28|
            29|   throwAfterA = recurse: n:
              |                          ^
            30|     if n > 0
 
        … from call site
-         at /pwd/eval-fail-mutual-recursion.nix:31:10:
+         at /pwd/in.nix:31:10:
            30|     if n > 0
            31|     then throwAfterA recurse (n - 1)
              |          ^
@@ -23,21 +23,21 @@ error:
        (19 duplicate frames omitted)
 
        … from call site
-         at /pwd/eval-fail-mutual-recursion.nix:33:10:
+         at /pwd/in.nix:33:10:
            32|     else if recurse
            33|     then throwAfterB true 10
              |          ^
            34|     else throw "Uh oh!";
 
        … while calling 'throwAfterB'
-         at /pwd/eval-fail-mutual-recursion.nix:22:26:
+         at /pwd/in.nix:22:26:
            21| let
            22|   throwAfterB = recurse: n:
              |                          ^
            23|     if n > 0
 
        … from call site
-         at /pwd/eval-fail-mutual-recursion.nix:24:10:
+         at /pwd/in.nix:24:10:
            23|     if n > 0
            24|     then throwAfterB recurse (n - 1)
              |          ^
@@ -46,7 +46,7 @@ error:
        (19 duplicate frames omitted)
 
        … from call site
-         at /pwd/eval-fail-mutual-recursion.nix:26:10:
+         at /pwd/in.nix:26:10:
            25|     else if recurse
            26|     then throwAfterA false 10
              |          ^
@@ -55,7 +55,7 @@ error:
        (21 duplicate frames omitted)
 
        … caused by explicit throw
-         at /pwd/eval-fail-mutual-recursion.nix:34:10:
+         at /pwd/in.nix:34:10:
            33|     then throwAfterB true 10
            34|     else throw "Uh oh!";
              |          ^
diff --git a/tests/functional/lang/eval-fail-mutual-recursion.nix b/tests/functional2/lang/mutual-recursion/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-mutual-recursion.nix
rename to tests/functional2/lang/mutual-recursion/in.nix
diff --git a/tests/functional/lang/eval-fail-nonexist-path.err.exp b/tests/functional2/lang/nonexist-path/eval-fail.err.exp
similarity index 100%
rename from tests/functional/lang/eval-fail-nonexist-path.err.exp
rename to tests/functional2/lang/nonexist-path/eval-fail.err.exp
diff --git a/tests/functional/lang/eval-fail-nonexist-path.nix b/tests/functional2/lang/nonexist-path/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-nonexist-path.nix
rename to tests/functional2/lang/nonexist-path/in.nix
diff --git a/tests/functional/lang/eval-fail-not-throws.err.exp b/tests/functional2/lang/not-throws/eval-fail.err.exp
similarity index 74%
rename from tests/functional/lang/eval-fail-not-throws.err.exp
rename to tests/functional2/lang/not-throws/eval-fail.err.exp
index e024ff612..69933bc77 100644
--- a/tests/functional/lang/eval-fail-not-throws.err.exp
+++ b/tests/functional2/lang/not-throws/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … caused by explicit throw
-         at /pwd/eval-fail-not-throws.nix:1:4:
+         at /pwd/in.nix:1:4:
             1| ! (throw "uh oh!")
              |    ^
             2|
diff --git a/tests/functional/lang/eval-fail-not-throws.nix b/tests/functional2/lang/not-throws/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-not-throws.nix
rename to tests/functional2/lang/not-throws/in.nix
diff --git a/tests/functional/lang/eval-fail-recursion.err.exp b/tests/functional2/lang/recursion/eval-fail.err.exp
similarity index 74%
rename from tests/functional/lang/eval-fail-recursion.err.exp
rename to tests/functional2/lang/recursion/eval-fail.err.exp
index aa57692b0..79d3778d8 100644
--- a/tests/functional/lang/eval-fail-recursion.err.exp
+++ b/tests/functional2/lang/recursion/eval-fail.err.exp
@@ -1,24 +1,24 @@
 error:
        … while evaluating an expression to select 'foo' on it
-         at /pwd/eval-fail-recursion.nix:1:21:
+         at /pwd/in.nix:1:21:
             1| let a = {} // a; in a.foo
              |                     ^
             2|
 
        … while evaluating a
-         at /pwd/eval-fail-recursion.nix:1:21:
+         at /pwd/in.nix:1:21:
             1| let a = {} // a; in a.foo
              |                     ^
             2|
 
        … while evaluating a
-         at /pwd/eval-fail-recursion.nix:1:15:
+         at /pwd/in.nix:1:15:
             1| let a = {} // a; in a.foo
              |               ^
             2|
 
        error: infinite recursion encountered
-       at /pwd/eval-fail-recursion.nix:1:15:
+       at /pwd/in.nix:1:15:
             1| let a = {} // a; in a.foo
              |               ^
             2|
diff --git a/tests/functional/lang/eval-fail-recursion.nix b/tests/functional2/lang/recursion/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-recursion.nix
rename to tests/functional2/lang/recursion/in.nix
diff --git a/tests/functional/lang/eval-fail-remove.err.exp b/tests/functional2/lang/remove/eval-fail.err.exp
similarity index 80%
rename from tests/functional/lang/eval-fail-remove.err.exp
rename to tests/functional2/lang/remove/eval-fail.err.exp
index 72c4f239f..b2bfe49ae 100644
--- a/tests/functional/lang/eval-fail-remove.err.exp
+++ b/tests/functional2/lang/remove/eval-fail.err.exp
@@ -1,5 +1,5 @@
 error: attribute 'x' missing
-       at /pwd/eval-fail-remove.nix:4:29:
+       at /pwd/in.nix:4:29:
             3| in
             4|   (removeAttrs attrs ["x"]).x
              |                             ^
diff --git a/tests/functional/lang/eval-fail-remove.nix b/tests/functional2/lang/remove/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-remove.nix
rename to tests/functional2/lang/remove/in.nix
diff --git a/tests/functional/lang/eval-fail-select-err.err.exp b/tests/functional2/lang/select-err/eval-fail.err.exp
similarity index 80%
rename from tests/functional/lang/eval-fail-select-err.err.exp
rename to tests/functional2/lang/select-err/eval-fail.err.exp
index bf326bb39..ca927b254 100644
--- a/tests/functional/lang/eval-fail-select-err.err.exp
+++ b/tests/functional2/lang/select-err/eval-fail.err.exp
@@ -1,20 +1,20 @@
 error:
        … while evaluating the attribute 'src.meta'
-         at /pwd/eval-fail-select-err.nix:2:3:
+         at /pwd/in.nix:2:3:
             1| let
             2|   somepkg.src = throw "invalid foo bar";
              |   ^
             3| in somepkg.src.meta
 
        … while evaluating an expression to select 'meta' on it
-         at /pwd/eval-fail-select-err.nix:3:16:
+         at /pwd/in.nix:3:16:
             2|   somepkg.src = throw "invalid foo bar";
             3| in somepkg.src.meta
              |                ^
             4|
 
        … caused by explicit throw
-         at /pwd/eval-fail-select-err.nix:2:17:
+         at /pwd/in.nix:2:17:
             1| let
             2|   somepkg.src = throw "invalid foo bar";
              |                 ^
diff --git a/tests/functional/lang/eval-fail-select-err.nix b/tests/functional2/lang/select-err/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-select-err.nix
rename to tests/functional2/lang/select-err/in.nix
diff --git a/tests/functional/lang/eval-fail-seq.err.exp b/tests/functional2/lang/seq/eval-fail.err.exp
similarity index 80%
rename from tests/functional/lang/eval-fail-seq.err.exp
rename to tests/functional2/lang/seq/eval-fail.err.exp
index f8387d741..03f7c4428 100644
--- a/tests/functional/lang/eval-fail-seq.err.exp
+++ b/tests/functional2/lang/seq/eval-fail.err.exp
@@ -1,12 +1,12 @@
 error:
        … while calling the 'seq' builtin
-         at /pwd/eval-fail-seq.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.seq (abort "foo") 2
              | ^
             2|
 
        … while calling the 'abort' builtin
-         at /pwd/eval-fail-seq.nix:1:15:
+         at /pwd/in.nix:1:15:
             1| builtins.seq (abort "foo") 2
              |               ^
             2|
diff --git a/tests/functional/lang/eval-fail-seq.nix b/tests/functional2/lang/seq/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-seq.nix
rename to tests/functional2/lang/seq/in.nix
diff --git a/tests/functional/lang/eval-fail-substring.err.exp b/tests/functional2/lang/substring/eval-fail.err.exp
similarity index 81%
rename from tests/functional/lang/eval-fail-substring.err.exp
rename to tests/functional2/lang/substring/eval-fail.err.exp
index 7329da3c7..d05ab7a72 100644
--- a/tests/functional/lang/eval-fail-substring.err.exp
+++ b/tests/functional2/lang/substring/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'substring' builtin
-         at /pwd/eval-fail-substring.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.substring (builtins.sub 0 1) 1 "x"
              | ^
             2|
diff --git a/tests/functional/lang/eval-fail-substring.nix b/tests/functional2/lang/substring/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-substring.nix
rename to tests/functional2/lang/substring/in.nix
diff --git a/tests/functional/lang/eval-fail-to-path.err.exp b/tests/functional2/lang/to-path/eval-fail.err.exp
similarity index 85%
rename from tests/functional/lang/eval-fail-to-path.err.exp
rename to tests/functional2/lang/to-path/eval-fail.err.exp
index 6cfaaff8c..fcde61401 100644
--- a/tests/functional/lang/eval-fail-to-path.err.exp
+++ b/tests/functional2/lang/to-path/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'toPath' builtin
-         at /pwd/eval-fail-to-path.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| builtins.toPath "foo/bar"
              | ^
             2|
diff --git a/tests/functional/lang/eval-fail-to-path.nix b/tests/functional2/lang/to-path/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-to-path.nix
rename to tests/functional2/lang/to-path/in.nix
diff --git a/tests/functional/lang/eval-fail-toString.err.exp b/tests/functional2/lang/toString/eval-fail.err.exp
similarity index 79%
rename from tests/functional/lang/eval-fail-toString.err.exp
rename to tests/functional2/lang/toString/eval-fail.err.exp
index a2c2ca25b..ed8f56846 100644
--- a/tests/functional/lang/eval-fail-toString.err.exp
+++ b/tests/functional2/lang/toString/eval-fail.err.exp
@@ -1,6 +1,6 @@
 error:
        … while calling the 'toString' builtin
-         at /pwd/eval-fail-toString.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| toString { __toString = 1; }
              | ^
             2|
@@ -8,7 +8,7 @@ error:
        … while converting a set to string
 
        error: attempt to call something which is not a function but an integer: 1
-       at /pwd/eval-fail-toString.nix:1:12:
+       at /pwd/in.nix:1:12:
             1| toString { __toString = 1; }
              |            ^
             2|
diff --git a/tests/functional/lang/eval-fail-toString.nix b/tests/functional2/lang/toString/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-toString.nix
rename to tests/functional2/lang/toString/in.nix
diff --git a/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp b/tests/functional2/lang/using-set-as-attr-name/eval-fail.err.exp
similarity index 70%
rename from tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp
rename to tests/functional2/lang/using-set-as-attr-name/eval-fail.err.exp
index 602c2acd2..712227dc6 100644
--- a/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp
+++ b/tests/functional2/lang/using-set-as-attr-name/eval-fail.err.exp
@@ -1,13 +1,13 @@
 error:
        … while evaluating an attribute name
-         at /pwd/eval-fail-using-set-as-attr-name.nix:5:10:
+         at /pwd/in.nix:5:10:
             4| in
             5|   attr.${key}
              |          ^
             6|
 
        error: expected a string but found a set: { }
-       at /pwd/eval-fail-using-set-as-attr-name.nix:5:10:
+       at /pwd/in.nix:5:10:
             4| in
             5|   attr.${key}
              |          ^
diff --git a/tests/functional/lang/eval-fail-using-set-as-attr-name.nix b/tests/functional2/lang/using-set-as-attr-name/in.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-using-set-as-attr-name.nix
rename to tests/functional2/lang/using-set-as-attr-name/in.nix