diff --git a/tests/functional/lang/binary-data b/tests/functional2/lang/builtins.hashFile/binary-data
similarity index 100%
rename from tests/functional/lang/binary-data
rename to tests/functional2/lang/builtins.hashFile/binary-data
diff --git a/tests/functional2/lang/builtins.hashFile/data b/tests/functional2/lang/builtins.hashFile/data
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/tests/functional2/lang/builtins.hashFile/data
@@ -0,0 +1 @@
+foo
diff --git a/tests/functional2/lang/hashfile-missing/eval-fail.err.exp b/tests/functional2/lang/builtins.hashFile/eval-fail-missing.err.exp
similarity index 100%
rename from tests/functional2/lang/hashfile-missing/eval-fail.err.exp
rename to tests/functional2/lang/builtins.hashFile/eval-fail-missing.err.exp
diff --git a/tests/functional/lang/eval-okay-hashfile.exp b/tests/functional2/lang/builtins.hashFile/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-hashfile.exp
rename to tests/functional2/lang/builtins.hashFile/eval-okay.out.exp
diff --git a/tests/functional2/lang/hashfile-missing/in.nix b/tests/functional2/lang/builtins.hashFile/in-missing.nix
similarity index 100%
rename from tests/functional2/lang/hashfile-missing/in.nix
rename to tests/functional2/lang/builtins.hashFile/in-missing.nix
diff --git a/tests/functional/lang/eval-okay-hashfile.nix b/tests/functional2/lang/builtins.hashFile/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-hashfile.nix
rename to tests/functional2/lang/builtins.hashFile/in.nix
diff --git a/tests/functional2/lang/builtins.hashFile/test.toml b/tests/functional2/lang/builtins.hashFile/test.toml
new file mode 100644
index 000000000..2ae2cd4de
--- /dev/null
+++ b/tests/functional2/lang/builtins.hashFile/test.toml
@@ -0,0 +1,7 @@
+[[test]]
+runner = "eval-okay"
+extra-files = [ "data", "binary-data" ]
+
+[[test]]
+runner = "eval-fail"
+in = "in-missing.nix"