diff --git a/tests/functional/lang/parse-fail-undef-var-2.err.exp b/tests/functional/lang/parse-fail-undef-var-2.err.exp
deleted file mode 100644
index 036d0f1f7..000000000
--- a/tests/functional/lang/parse-fail-undef-var-2.err.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-error: syntax error, expecting '}'
-       at /pwd/parse-fail-undef-var-2.nix:3:13:
-            2|
-            3|   f = {x, y : ["baz" "bar" z "bat"]}: x + y;
-             |             ^
-            4|
diff --git a/tests/functional/lang/parse-fail-undef-var-2.nix b/tests/functional/lang/parse-fail-undef-var-2.nix
deleted file mode 100644
index c2e959495..000000000
--- a/tests/functional/lang/parse-fail-undef-var-2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-let
-
-  f = {x, y : ["baz" "bar" z "bat"]}: x + y;
-
-in
-f {x = "foo"; y = "bar";}
diff --git a/tests/functional2/lang/undefined-var/in-2.nix b/tests/functional2/lang/undefined-var/in-2.nix
new file mode 100644
index 000000000..5add9f888
--- /dev/null
+++ b/tests/functional2/lang/undefined-var/in-2.nix
@@ -0,0 +1,6 @@
+let
+
+  f = {x, y ? ["baz" "bar" z "bat"]}: x + y;
+
+in
+f {x = "foo"; y = "bar";}
diff --git a/tests/functional/lang/parse-fail-undef-var.nix b/tests/functional2/lang/undefined-var/in.nix
similarity index 100%
rename from tests/functional/lang/parse-fail-undef-var.nix
rename to tests/functional2/lang/undefined-var/in.nix
diff --git a/tests/functional2/lang/undefined-var/parse-fail-2.err.exp b/tests/functional2/lang/undefined-var/parse-fail-2.err.exp
new file mode 100644
index 000000000..7bd4f9ad2
--- /dev/null
+++ b/tests/functional2/lang/undefined-var/parse-fail-2.err.exp
@@ -0,0 +1,6 @@
+error: undefined variable 'z'
+       at /pwd/in.nix:3:28:
+            2|
+            3|   f = {x, y ? ["baz" "bar" z "bat"]}: x + y;
+             |                            ^
+            4|
diff --git a/tests/functional/lang/parse-fail-undef-var.err.exp b/tests/functional2/lang/undefined-var/parse-fail.err.exp
similarity index 65%
rename from tests/functional/lang/parse-fail-undef-var.err.exp
rename to tests/functional2/lang/undefined-var/parse-fail.err.exp
index 38b8fd5cb..bf10ce375 100644
--- a/tests/functional/lang/parse-fail-undef-var.err.exp
+++ b/tests/functional2/lang/undefined-var/parse-fail.err.exp
@@ -1,5 +1,5 @@
 error: undefined variable 'y'
-       at /pwd/parse-fail-undef-var.nix:1:4:
+       at /pwd/in.nix:1:4:
             1| x: y
              |    ^
             2|