diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index 55ee0971d..2b63dda3e 100644
--- a/tests/functional/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
@@ -96,11 +96,6 @@ nix build -o $TEST_ROOT/result git+file://$flake1Dir
 nix build -o $flake1Dir/result git+file://$flake1Dir
 nix path-info $flake1Dir/result
 
-# Ensure that eval-system affects the chosen attribute
-cp -r "$flake1Dir" "$flake1Dir.kittified"
-sed -i "s#$system#kitty-kitty#" "$flake1Dir.kittified/flake.nix"
-nix build --eval-system kitty-kitty "$flake1Dir.kittified"
-
 # 'getFlake' on an unlocked flakeref should fail in pure mode, but
 # succeed in impure mode.
 (! nix build -o $TEST_ROOT/result --expr "(builtins.getFlake \"$flake1Dir\").packages.$system.default")
diff --git a/tests/functional2/flakes/test_cli.py b/tests/functional2/flakes/test_cli.py
index c01250ded..c122ed32f 100644
--- a/tests/functional2/flakes/test_cli.py
+++ b/tests/functional2/flakes/test_cli.py
@@ -166,6 +166,13 @@ class TestAttrMatch:
             assert "-simple.drv" in path
 
 
+def test_eval_system_takes_effect(nix: Nix, flake1: Path):
+    (flake1 / "flake.nix").write_text(
+        (flake1 / "flake.nix").read_text().replace(system, "kitty-kitty")
+    )
+    nix.nix(["build", "--eval-system", "kitty-kitty", flake1]).run().ok()
+
+
 @pytest.mark.usefixtures("registry")
 class TestRegistry:
     def test_registry_list(self, nix: Nix):