diff --git a/tests/functional/lang/eval-okay-getenv.nix b/tests/functional/lang/eval-okay-getenv.nix
deleted file mode 100644
index 4cfec5f55..000000000
--- a/tests/functional/lang/eval-okay-getenv.nix
+++ /dev/null
@@ -1 +0,0 @@
-builtins.getEnv "TEST_VAR" + (if builtins.getEnv "NO_SUCH_VAR" == "" then "bar" else "bla")
diff --git a/tests/functional2/lang/builtins.getEnv/__init__.py b/tests/functional2/lang/builtins.getEnv/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/functional/lang/eval-okay-getenv.exp b/tests/functional2/lang/builtins.getEnv/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-getenv.exp
rename to tests/functional2/lang/builtins.getEnv/eval-okay.out.exp
diff --git a/tests/functional2/lang/builtins.getEnv/test_get_env.py b/tests/functional2/lang/builtins.getEnv/test_get_env.py
new file mode 100644
index 000000000..85c17fd2f
--- /dev/null
+++ b/tests/functional2/lang/builtins.getEnv/test_get_env.py
@@ -0,0 +1,21 @@
+from collections.abc import Callable
+from pathlib import Path
+
+from functional2.lang.test_lang import test_eval as nix_eval
+from functional2.testlib.fixtures.file_helper import with_files, File, AssetSymlink
+from functional2.testlib.fixtures.nix import Nix
+from functional2.testlib.fixtures.snapshot import Snapshot
+
+
+@with_files(
+    {
+        "in.nix": File(
+            'builtins.getEnv "TEST_VAR" + (if builtins.getEnv "NO_SUCH_VAR" == "" then "bar" else "bla")'
+        ),
+        "out.exp": AssetSymlink("eval-okay.out.exp"),
+        "err.exp": AssetSymlink("eval-okay.err.exp"),
+    }
+)
+def test_get_env(nix: Nix, snapshot: Callable[[str], Snapshot], files: Path):
+    nix.env["TEST_VAR"] = "foo"
+    nix_eval(files, nix, [], snapshot)