diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp b/tests/functional2/lang/builtins.fromTOML/eval-fail-overflow.err.exp
similarity index 100%
rename from tests/functional2/lang/fromTOML-overflowing/eval-fail-overflow.err.exp
rename to tests/functional2/lang/builtins.fromTOML/eval-fail-overflow.err.exp
diff --git a/tests/functional2/lang/fromTOML-timestamps/eval-fail.err.exp b/tests/functional2/lang/builtins.fromTOML/eval-fail-timestamps.err.exp
similarity index 100%
rename from tests/functional2/lang/fromTOML-timestamps/eval-fail.err.exp
rename to tests/functional2/lang/builtins.fromTOML/eval-fail-timestamps.err.exp
diff --git a/tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp b/tests/functional2/lang/builtins.fromTOML/eval-fail-underflow.err.exp
similarity index 100%
rename from tests/functional2/lang/fromTOML-overflowing/eval-fail-underflow.err.exp
rename to tests/functional2/lang/builtins.fromTOML/eval-fail-underflow.err.exp
diff --git a/tests/functional/lang/eval-okay-fromTOML.exp b/tests/functional2/lang/builtins.fromTOML/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-fromTOML.exp
rename to tests/functional2/lang/builtins.fromTOML/eval-okay.out.exp
diff --git a/tests/functional2/lang/fromTOML-overflowing/in-overflow.nix b/tests/functional2/lang/builtins.fromTOML/in-overflow.nix
similarity index 100%
rename from tests/functional2/lang/fromTOML-overflowing/in-overflow.nix
rename to tests/functional2/lang/builtins.fromTOML/in-overflow.nix
diff --git a/tests/functional2/lang/fromTOML-timestamps/in.nix b/tests/functional2/lang/builtins.fromTOML/in-timestamps.nix
similarity index 100%
rename from tests/functional2/lang/fromTOML-timestamps/in.nix
rename to tests/functional2/lang/builtins.fromTOML/in-timestamps.nix
diff --git a/tests/functional2/lang/fromTOML-overflowing/in-underflow.nix b/tests/functional2/lang/builtins.fromTOML/in-underflow.nix
similarity index 100%
rename from tests/functional2/lang/fromTOML-overflowing/in-underflow.nix
rename to tests/functional2/lang/builtins.fromTOML/in-underflow.nix
diff --git a/tests/functional/lang/eval-okay-fromTOML.nix b/tests/functional2/lang/builtins.fromTOML/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-fromTOML.nix
rename to tests/functional2/lang/builtins.fromTOML/in.nix