diff --git a/tests/functional/lang/eval-okay-delayed-with-inherit.exp b/tests/functional2/lang/with/eval-okay-delayed-with-inherit.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-delayed-with-inherit.exp
rename to tests/functional2/lang/with/eval-okay-delayed-with-inherit.out.exp
diff --git a/tests/functional/lang/eval-okay-delayed-with.exp b/tests/functional2/lang/with/eval-okay-delayed-with.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-delayed-with.exp
rename to tests/functional2/lang/with/eval-okay-delayed-with.out.exp
diff --git a/tests/functional2/lang/nested-with/eval-okay.out.exp b/tests/functional2/lang/with/eval-okay-nested-with.out.exp
similarity index 100%
rename from tests/functional2/lang/nested-with/eval-okay.out.exp
rename to tests/functional2/lang/with/eval-okay-nested-with.out.exp
diff --git a/tests/functional/lang/eval-okay-delayed-with-inherit.nix b/tests/functional2/lang/with/in-delayed-with-inherit.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-delayed-with-inherit.nix
rename to tests/functional2/lang/with/in-delayed-with-inherit.nix
diff --git a/tests/functional/lang/eval-okay-delayed-with.nix b/tests/functional2/lang/with/in-delayed-with.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-delayed-with.nix
rename to tests/functional2/lang/with/in-delayed-with.nix
diff --git a/tests/functional2/lang/nested-with/in.nix b/tests/functional2/lang/with/in-nested-with.nix
similarity index 100%
rename from tests/functional2/lang/nested-with/in.nix
rename to tests/functional2/lang/with/in-nested-with.nix