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