diff --git a/tests/functional2/lang/flake-ref-to-string-negative-integer/eval-fail.err.exp b/tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string-negative-integer/eval-fail.err.exp
rename to tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp
diff --git a/tests/functional2/lang/flake-ref-to-string-negative-integer/in.nix b/tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string-negative-integer/in.nix
rename to tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix
diff --git a/tests/functional2/lang/using-set-as-attr-name/eval-fail.err.exp b/tests/functional2/lang/set/eval-fail-2.err.exp
similarity index 100%
rename from tests/functional2/lang/using-set-as-attr-name/eval-fail.err.exp
rename to tests/functional2/lang/set/eval-fail-2.err.exp
diff --git a/tests/functional2/lang/using-set-as-attr-name/in.nix b/tests/functional2/lang/set/in-2.nix
similarity index 100%
rename from tests/functional2/lang/using-set-as-attr-name/in.nix
rename to tests/functional2/lang/set/in-2.nix