diff --git a/tests/functional2/lang/foldlStrict-strict-op-application/eval-fail.err.exp b/tests/functional2/lang/builtins.foldl'/eval-fail-strict-op-application.err.exp
similarity index 100%
rename from tests/functional2/lang/foldlStrict-strict-op-application/eval-fail.err.exp
rename to tests/functional2/lang/builtins.foldl'/eval-fail-strict-op-application.err.exp
diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp b/tests/functional2/lang/builtins.foldl'/eval-okay-lazy-elements.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp
rename to tests/functional2/lang/builtins.foldl'/eval-okay-lazy-elements.out.exp
diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp b/tests/functional2/lang/builtins.foldl'/eval-okay-lazy-initial-accumulator.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp
rename to tests/functional2/lang/builtins.foldl'/eval-okay-lazy-initial-accumulator.out.exp
diff --git a/tests/functional/lang/eval-okay-foldlStrict.exp b/tests/functional2/lang/builtins.foldl'/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict.exp
rename to tests/functional2/lang/builtins.foldl'/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix b/tests/functional2/lang/builtins.foldl'/in-lazy-elements.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix
rename to tests/functional2/lang/builtins.foldl'/in-lazy-elements.nix
diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/tests/functional2/lang/builtins.foldl'/in-lazy-initial-accumulator.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix
rename to tests/functional2/lang/builtins.foldl'/in-lazy-initial-accumulator.nix
diff --git a/tests/functional2/lang/foldlStrict-strict-op-application/in.nix b/tests/functional2/lang/builtins.foldl'/in-strict-op-application.nix
similarity index 100%
rename from tests/functional2/lang/foldlStrict-strict-op-application/in.nix
rename to tests/functional2/lang/builtins.foldl'/in-strict-op-application.nix
diff --git a/tests/functional/lang/eval-okay-foldlStrict.nix b/tests/functional2/lang/builtins.foldl'/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-foldlStrict.nix
rename to tests/functional2/lang/builtins.foldl'/in.nix