diff --git a/tests/functional/lang/eval-okay-toxml2.exp b/tests/functional2/lang/builtins.toXML/eval-okay-2.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-toxml2.exp
rename to tests/functional2/lang/builtins.toXML/eval-okay-2.out.exp
diff --git a/tests/functional/lang/eval-okay-toxml.exp b/tests/functional2/lang/builtins.toXML/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-toxml.exp
rename to tests/functional2/lang/builtins.toXML/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-toxml2.nix b/tests/functional2/lang/builtins.toXML/in-2.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-toxml2.nix
rename to tests/functional2/lang/builtins.toXML/in-2.nix
diff --git a/tests/functional/lang/eval-okay-toxml.nix b/tests/functional2/lang/builtins.toXML/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-toxml.nix
rename to tests/functional2/lang/builtins.toXML/in.nix