diff --git a/tests/functional/lang/eval-okay-functionargs.exp.xml b/tests/functional/lang/eval-okay-functionargs.exp.xml
deleted file mode 100644
index 651f54c36..000000000
--- a/tests/functional/lang/eval-okay-functionargs.exp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <list>
-    <string value="stdenv" />
-    <string value="fetchurl" />
-    <string value="aterm-stdenv" />
-    <string value="aterm-stdenv2" />
-    <string value="libX11" />
-    <string value="libXv" />
-    <string value="mplayer-stdenv2.libXv-libX11" />
-    <string value="mplayer-stdenv2.libXv-libX11_2" />
-    <string value="nix-stdenv-aterm-stdenv" />
-    <string value="nix-stdenv2-aterm2-stdenv2" />
-  </list>
-</expr>
diff --git a/tests/functional/lang/eval-fail-missing-and-unexpected-args.err.exp b/tests/functional2/lang/function-args/eval-fail-missing-and-unexpected-args.err.exp
similarity index 76%
rename from tests/functional/lang/eval-fail-missing-and-unexpected-args.err.exp
rename to tests/functional2/lang/function-args/eval-fail-missing-and-unexpected-args.err.exp
index 8d77232c4..9f51f8836 100644
--- a/tests/functional/lang/eval-fail-missing-and-unexpected-args.err.exp
+++ b/tests/functional2/lang/function-args/eval-fail-missing-and-unexpected-args.err.exp
@@ -1,12 +1,12 @@
 error:
        … from call site
-         at /pwd/eval-fail-missing-and-unexpected-args.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| ({a, b, c}: a + b + c) {c = 1; d = 1; e = 1; f = 1;}
              | ^
             2|
 
        error: function 'anonymous lambda' called without required arguments 'a' and 'b' and with unexpected arguments 'd', 'e' and 'f'
-       at /pwd/eval-fail-missing-and-unexpected-args.nix:1:2:
+       at /pwd/in.nix:1:2:
             1| ({a, b, c}: a + b + c) {c = 1; d = 1; e = 1; f = 1;}
              |  ^
             2|
diff --git a/tests/functional/lang/eval-fail-missing-arg.err.exp b/tests/functional2/lang/function-args/eval-fail-missing-arg.err.exp
similarity index 76%
rename from tests/functional/lang/eval-fail-missing-arg.err.exp
rename to tests/functional2/lang/function-args/eval-fail-missing-arg.err.exp
index 220e40e58..58469e38a 100644
--- a/tests/functional/lang/eval-fail-missing-arg.err.exp
+++ b/tests/functional2/lang/function-args/eval-fail-missing-arg.err.exp
@@ -1,12 +1,12 @@
 error:
        … from call site
-         at /pwd/eval-fail-missing-arg.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";}
              | ^
             2|
 
        error: function 'anonymous lambda' called without required argument 'y'
-       at /pwd/eval-fail-missing-arg.nix:1:2:
+       at /pwd/in.nix:1:2:
             1| ({x, y, z}: x + y + z) {x = "foo"; z = "bar";}
              |  ^
             2|
diff --git a/tests/functional/lang/eval-fail-missing-args.err.exp b/tests/functional2/lang/function-args/eval-fail-missing-args.err.exp
similarity index 75%
rename from tests/functional/lang/eval-fail-missing-args.err.exp
rename to tests/functional2/lang/function-args/eval-fail-missing-args.err.exp
index 96675fc78..467588a74 100644
--- a/tests/functional/lang/eval-fail-missing-args.err.exp
+++ b/tests/functional2/lang/function-args/eval-fail-missing-args.err.exp
@@ -1,12 +1,12 @@
 error:
        … from call site
-         at /pwd/eval-fail-missing-args.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| ({a, b, c, d}: a + b + c + d) { }
              | ^
             2|
 
        error: function 'anonymous lambda' called without required arguments 'a', 'b', 'c' and 'd'
-       at /pwd/eval-fail-missing-args.nix:1:2:
+       at /pwd/in.nix:1:2:
             1| ({a, b, c, d}: a + b + c + d) { }
              |  ^
             2|
diff --git a/tests/functional/lang/eval-fail-undeclared-arg.err.exp b/tests/functional2/lang/function-args/eval-fail-unexpected-arg.err.exp
similarity index 75%
rename from tests/functional/lang/eval-fail-undeclared-arg.err.exp
rename to tests/functional2/lang/function-args/eval-fail-unexpected-arg.err.exp
index a0b84b910..dc505ea1c 100644
--- a/tests/functional/lang/eval-fail-undeclared-arg.err.exp
+++ b/tests/functional2/lang/function-args/eval-fail-unexpected-arg.err.exp
@@ -1,12 +1,12 @@
 error:
        … from call site
-         at /pwd/eval-fail-undeclared-arg.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";}
              | ^
             2|
 
        error: function 'anonymous lambda' called with unexpected argument 'y'
-       at /pwd/eval-fail-undeclared-arg.nix:1:2:
+       at /pwd/in.nix:1:2:
             1| ({x, z}: x + z) {x = "foo"; y = "bla"; z = "bar";}
              |  ^
             2|
diff --git a/tests/functional/lang/eval-fail-undeclared-args.err.exp b/tests/functional2/lang/function-args/eval-fail-unexpected-args.err.exp
similarity index 78%
rename from tests/functional/lang/eval-fail-undeclared-args.err.exp
rename to tests/functional2/lang/function-args/eval-fail-unexpected-args.err.exp
index 7a8381d2f..525ff0b75 100644
--- a/tests/functional/lang/eval-fail-undeclared-args.err.exp
+++ b/tests/functional2/lang/function-args/eval-fail-unexpected-args.err.exp
@@ -1,12 +1,12 @@
 error:
        … from call site
-         at /pwd/eval-fail-undeclared-args.nix:1:1:
+         at /pwd/in.nix:1:1:
             1| ({a ? "foo", b ? "bar"}: a + b) {c = "meow"; d = "meow";}
              | ^
             2|
 
        error: function 'anonymous lambda' called with unexpected arguments 'c' and 'd'
-       at /pwd/eval-fail-undeclared-args.nix:1:2:
+       at /pwd/in.nix:1:2:
             1| ({a ? "foo", b ? "bar"}: a + b) {c = "meow"; d = "meow";}
              |  ^
             2|
diff --git a/tests/functional/lang/eval-okay-empty-args.exp b/tests/functional2/lang/function-args/eval-okay-empty-args.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-empty-args.exp
rename to tests/functional2/lang/function-args/eval-okay-empty-args.out.exp
diff --git a/tests/functional/lang/eval-okay-functionargs.exp b/tests/functional2/lang/function-args/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-functionargs.exp
rename to tests/functional2/lang/function-args/eval-okay.out.exp
diff --git a/tests/functional/lang/parse-fail-patterns-1.nix b/tests/functional2/lang/function-args/in-dup-formals-2.nix
similarity index 100%
rename from tests/functional/lang/parse-fail-patterns-1.nix
rename to tests/functional2/lang/function-args/in-dup-formals-2.nix
diff --git a/tests/functional/lang/parse-fail-dup-formals.nix b/tests/functional2/lang/function-args/in-dup-formals.nix
similarity index 100%
rename from tests/functional/lang/parse-fail-dup-formals.nix
rename to tests/functional2/lang/function-args/in-dup-formals.nix
diff --git a/tests/functional/lang/eval-okay-empty-args.nix b/tests/functional2/lang/function-args/in-empty-args.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-empty-args.nix
rename to tests/functional2/lang/function-args/in-empty-args.nix
diff --git a/tests/functional/lang/eval-fail-missing-and-unexpected-args.nix b/tests/functional2/lang/function-args/in-missing-and-unexpected-args.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-missing-and-unexpected-args.nix
rename to tests/functional2/lang/function-args/in-missing-and-unexpected-args.nix
diff --git a/tests/functional/lang/eval-fail-missing-arg.nix b/tests/functional2/lang/function-args/in-missing-arg.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-missing-arg.nix
rename to tests/functional2/lang/function-args/in-missing-arg.nix
diff --git a/tests/functional/lang/eval-fail-missing-args.nix b/tests/functional2/lang/function-args/in-missing-args.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-missing-args.nix
rename to tests/functional2/lang/function-args/in-missing-args.nix
diff --git a/tests/functional/lang/eval-fail-undeclared-arg.nix b/tests/functional2/lang/function-args/in-unexpected-arg.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-undeclared-arg.nix
rename to tests/functional2/lang/function-args/in-unexpected-arg.nix
diff --git a/tests/functional/lang/eval-fail-undeclared-args.nix b/tests/functional2/lang/function-args/in-unexpected-args.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-undeclared-args.nix
rename to tests/functional2/lang/function-args/in-unexpected-args.nix
diff --git a/tests/functional/lang/eval-okay-functionargs.nix b/tests/functional2/lang/function-args/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-functionargs.nix
rename to tests/functional2/lang/function-args/in.nix
diff --git a/tests/functional/lang/parse-fail-patterns-1.err.exp b/tests/functional2/lang/function-args/parse-fail-dup-formals-2.err.exp
similarity index 72%
rename from tests/functional/lang/parse-fail-patterns-1.err.exp
rename to tests/functional2/lang/function-args/parse-fail-dup-formals-2.err.exp
index 9278c6af6..c4f118c85 100644
--- a/tests/functional/lang/parse-fail-patterns-1.err.exp
+++ b/tests/functional2/lang/function-args/parse-fail-dup-formals-2.err.exp
@@ -1,5 +1,5 @@
 error: duplicate formal function argument 'args'
-       at /pwd/parse-fail-patterns-1.nix:1:1:
+       at /pwd/in.nix:1:1:
             1| args@{args, x, y, z}: x
              | ^
             2|
diff --git a/tests/functional/lang/parse-fail-dup-formals.err.exp b/tests/functional2/lang/function-args/parse-fail-dup-formals.err.exp
similarity index 67%
rename from tests/functional/lang/parse-fail-dup-formals.err.exp
rename to tests/functional2/lang/function-args/parse-fail-dup-formals.err.exp
index 9f6520e91..e669fdf77 100644
--- a/tests/functional/lang/parse-fail-dup-formals.err.exp
+++ b/tests/functional2/lang/function-args/parse-fail-dup-formals.err.exp
@@ -1,4 +1,4 @@
 error: duplicate formal function argument 'x'
-       at /pwd/parse-fail-dup-formals.nix:1:8:
+       at /pwd/in.nix:1:8:
             1| {x, y, x}: x
              |        ^