diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh
index cac0b896d..fa8a3406e 100755
--- a/tests/functional/lang.sh
+++ b/tests/functional/lang.sh
@@ -56,29 +56,6 @@ for i in parse-fail-*.nix; do
     fi
 done
 
-for i in parse-okay-*.nix; do
-    echo "parsing $i (should succeed)";
-    i=$(basename "$i" .nix)
-
-    declare -a flags=()
-    if test -e "$i.flags"; then
-        read -r -a flags < "$i.flags"
-    fi
-    if
-        expect 0 nix-instantiate --parse "${flags[@]}" "$i.nix" \
-            1> "$i.out" \
-            2> "$i.err"
-    then
-        sed -i "s!$(pwd)!/pwd!g" "$i.out" "$i.err"
-        yq --in-place --yaml-output '.' "$i.out"
-        diffAndAccept "$i" out exp
-        diffAndAccept "$i" err err.exp
-    else
-        echo "FAIL: $i should parse"
-        badExitCode=1
-    fi
-done
-
 for i in eval-fail-*.nix; do
     echo "evaluating $i (should fail)";
     i=$(basename "$i" .nix)
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
deleted file mode 100644
index 6a0465f1a..000000000
--- a/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-error: attribute 'z' already defined at /pwd/parse-fail-mixed-nested-attrs1.nix:3:16
-       at /pwd/parse-fail-mixed-nested-attrs1.nix:2:3:
-            1| {
-            2|   x.z = 3;
-             |   ^
-            3|   x = { y = 3; z = 3; };
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
deleted file mode 100644
index f4d66a9cc..000000000
--- a/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-error: attribute 'y' already defined at /pwd/parse-fail-mixed-nested-attrs2.nix:3:9
-       at /pwd/parse-fail-mixed-nested-attrs2.nix:2:3:
-            1| {
-            2|   x.y.y = 3;
-             |   ^
-            3|   x = { y.y= 3; z = 3; };
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix b/tests/functional2/lang/parser-merge-attrs/in-1.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix
rename to tests/functional2/lang/parser-merge-attrs/in-1.nix
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix b/tests/functional2/lang/parser-merge-attrs/in-2.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix
rename to tests/functional2/lang/parser-merge-attrs/in-2.nix
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix b/tests/functional2/lang/parser-merge-attrs/in-3.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix
rename to tests/functional2/lang/parser-merge-attrs/in-3.nix
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs1.nix b/tests/functional2/lang/parser-merge-attrs/in-err1.nix
similarity index 100%
rename from tests/functional/lang/parse-fail-mixed-nested-attrs1.nix
rename to tests/functional2/lang/parser-merge-attrs/in-err1.nix
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs2.nix b/tests/functional2/lang/parser-merge-attrs/in-err2.nix
similarity index 100%
rename from tests/functional/lang/parse-fail-mixed-nested-attrs2.nix
rename to tests/functional2/lang/parser-merge-attrs/in-err2.nix
diff --git a/tests/functional2/lang/parser-merge-attrs/parse-fail-err1.err.exp b/tests/functional2/lang/parser-merge-attrs/parse-fail-err1.err.exp
new file mode 100644
index 000000000..d65abb1ed
--- /dev/null
+++ b/tests/functional2/lang/parser-merge-attrs/parse-fail-err1.err.exp
@@ -0,0 +1,6 @@
+error: attribute 'z' already defined at /pwd/in.nix:3:16
+       at /pwd/in.nix:2:3:
+            1| {
+            2|   x.z = 3;
+             |   ^
+            3|   x = { y = 3; z = 3; };
diff --git a/tests/functional2/lang/parser-merge-attrs/parse-fail-err2.err.exp b/tests/functional2/lang/parser-merge-attrs/parse-fail-err2.err.exp
new file mode 100644
index 000000000..097ae785d
--- /dev/null
+++ b/tests/functional2/lang/parser-merge-attrs/parse-fail-err2.err.exp
@@ -0,0 +1,6 @@
+error: attribute 'y' already defined at /pwd/in.nix:3:9
+       at /pwd/in.nix:2:3:
+            1| {
+            2|   x.y.y = 3;
+             |   ^
+            3|   x = { y.y= 3; z = 3; };
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp b/tests/functional2/lang/parser-merge-attrs/parse-okay-1.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp
rename to tests/functional2/lang/parser-merge-attrs/parse-okay-1.out.exp
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp b/tests/functional2/lang/parser-merge-attrs/parse-okay-2.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp
rename to tests/functional2/lang/parser-merge-attrs/parse-okay-2.out.exp
diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp b/tests/functional2/lang/parser-merge-attrs/parse-okay-3.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp
rename to tests/functional2/lang/parser-merge-attrs/parse-okay-3.out.exp