diff --git a/tests/functional/lang/eval-okay-inherit-attr-pos.exp b/tests/functional/lang/eval-okay-inherit-attr-pos.exp
deleted file mode 100644
index 2d87c610c..000000000
--- a/tests/functional/lang/eval-okay-inherit-attr-pos.exp
+++ /dev/null
@@ -1 +0,0 @@
-[ { column = 17; file = "/pwd/eval-okay-inherit-attr-pos.nix"; line = 4; } { column = 19; file = "/pwd/eval-okay-inherit-attr-pos.nix"; line = 4; } { column = 21; file = "/pwd/eval-okay-inherit-attr-pos.nix"; line = 5; } { column = 23; file = "/pwd/eval-okay-inherit-attr-pos.nix"; line = 5; } ]
diff --git a/tests/functional/lang/eval-okay-inherit-from.flags b/tests/functional/lang/eval-okay-inherit-from.flags
deleted file mode 100644
index a0e513a81..000000000
--- a/tests/functional/lang/eval-okay-inherit-from.flags
+++ /dev/null
@@ -1 +0,0 @@
---extra-deprecated-features rec-set-overrides
diff --git a/tests/functional/lang/eval-okay-inherit-from.err.exp b/tests/functional2/lang/inherit-from/eval-okay.err.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-inherit-from.err.exp
rename to tests/functional2/lang/inherit-from/eval-okay.err.exp
diff --git a/tests/functional/lang/eval-okay-inherit-from.exp b/tests/functional2/lang/inherit-from/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-inherit-from.exp
rename to tests/functional2/lang/inherit-from/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-inherit-from.nix b/tests/functional2/lang/inherit-from/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-inherit-from.nix
rename to tests/functional2/lang/inherit-from/in.nix
diff --git a/tests/functional2/lang/inherit-from/test.toml b/tests/functional2/lang/inherit-from/test.toml
new file mode 100644
index 000000000..13d17947e
--- /dev/null
+++ b/tests/functional2/lang/inherit-from/test.toml
@@ -0,0 +1,3 @@
+[[test]]
+runner = "eval-okay"
+flags = [ "--extra-deprecated-features", "rec-set-overrides" ]
diff --git a/tests/functional2/lang/inherit/eval-okay-unsafeGetAttrPos.out.exp b/tests/functional2/lang/inherit/eval-okay-unsafeGetAttrPos.out.exp
new file mode 100644
index 000000000..2e0418b62
--- /dev/null
+++ b/tests/functional2/lang/inherit/eval-okay-unsafeGetAttrPos.out.exp
@@ -0,0 +1 @@
+[ { column = 17; file = "/pwd/in.nix"; line = 4; } { column = 19; file = "/pwd/in.nix"; line = 4; } { column = 21; file = "/pwd/in.nix"; line = 5; } { column = 23; file = "/pwd/in.nix"; line = 5; } ]
diff --git a/tests/functional/lang/eval-okay-inherit-attr-pos.nix b/tests/functional2/lang/inherit/in-unsafeGetAttrPos.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-inherit-attr-pos.nix
rename to tests/functional2/lang/inherit/in-unsafeGetAttrPos.nix