diff --git a/tests/functional/lang/eval-fail-print-limit-list.err.exp b/tests/functional2/lang/value-printer/eval-fail-elide-list.err.exp
similarity index 84%
rename from tests/functional/lang/eval-fail-print-limit-list.err.exp
rename to tests/functional2/lang/value-printer/eval-fail-elide-list.err.exp
index bcf5efb5e..3d31b461d 100644
--- a/tests/functional/lang/eval-fail-print-limit-list.err.exp
+++ b/tests/functional2/lang/value-printer/eval-fail-elide-list.err.exp
@@ -1,5 +1,5 @@
 error: expected a Boolean but found a list: [ 1 [ 2 3 4 5 6 7 8 9 [ 1 «2 items elided» ] «2 items elided» ] «1 item elided» ]
-       at /pwd/eval-fail-print-limit-list.nix:2:3:
+       at /pwd/in.nix:2:3:
             1| assert (
             2|   let x = [ 1 [ 2 3 4 5 6 7 8 9 x 10 11 ] 12 ];
              |   ^
diff --git a/tests/functional/lang/eval-fail-print-limit-set.err.exp b/tests/functional2/lang/value-printer/eval-fail-elide-set.err.exp
similarity index 88%
rename from tests/functional/lang/eval-fail-print-limit-set.err.exp
rename to tests/functional2/lang/value-printer/eval-fail-elide-set.err.exp
index 35f12c572..e4ae203c8 100644
--- a/tests/functional/lang/eval-fail-print-limit-set.err.exp
+++ b/tests/functional2/lang/value-printer/eval-fail-elide-set.err.exp
@@ -1,5 +1,5 @@
 error: expected a Boolean but found a set: { a = { a = { a = { a = { a = { a = { a = { a = { a = { a = { ... }; b = 2; }; }; }; }; }; }; }; }; «1 attribute elided» }; «1 attribute elided» }
-       at /pwd/eval-fail-print-limit-set.nix:2:3:
+       at /pwd/in.nix:2:3:
             1| assert (
             2|   let x = { a.a.a.a.a.a.a.a.a = { a.a = 1; b = 2; }; a.b.c.x = 3; c = 4; };
              |   ^
diff --git a/tests/functional/lang/eval-okay-repeated-empty-list.exp b/tests/functional2/lang/value-printer/eval-okay-repeated-empty-list.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-repeated-empty-list.exp
rename to tests/functional2/lang/value-printer/eval-okay-repeated-empty-list.out.exp
diff --git a/tests/functional/lang/eval-okay-repeated-empty-attrs.exp b/tests/functional2/lang/value-printer/eval-okay-repeated-empty-set.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-repeated-empty-attrs.exp
rename to tests/functional2/lang/value-printer/eval-okay-repeated-empty-set.out.exp
diff --git a/tests/functional/lang/eval-fail-print-limit-list.nix b/tests/functional2/lang/value-printer/in-elide-list.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-print-limit-list.nix
rename to tests/functional2/lang/value-printer/in-elide-list.nix
diff --git a/tests/functional/lang/eval-fail-print-limit-set.nix b/tests/functional2/lang/value-printer/in-elide-set.nix
similarity index 100%
rename from tests/functional/lang/eval-fail-print-limit-set.nix
rename to tests/functional2/lang/value-printer/in-elide-set.nix
diff --git a/tests/functional/lang/eval-okay-repeated-empty-list.nix b/tests/functional2/lang/value-printer/in-repeated-empty-list.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-repeated-empty-list.nix
rename to tests/functional2/lang/value-printer/in-repeated-empty-list.nix
diff --git a/tests/functional/lang/eval-okay-repeated-empty-attrs.nix b/tests/functional2/lang/value-printer/in-repeated-empty-set.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-repeated-empty-attrs.nix
rename to tests/functional2/lang/value-printer/in-repeated-empty-set.nix