diff --git a/tests/functional/lang/eval-okay-autoargs.flags b/tests/functional/lang/eval-okay-autoargs.flags
deleted file mode 100644
index 7163ac42f..000000000
--- a/tests/functional/lang/eval-okay-autoargs.flags
+++ /dev/null
@@ -1 +0,0 @@
---arg lib import(./lib.nix) --argstr xyzzy xyzzy! -A result
diff --git a/tests/functional/lang/eval-okay-autoargs.exp b/tests/functional2/lang/function-autoargs/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-autoargs.exp
rename to tests/functional2/lang/function-autoargs/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-autoargs.nix b/tests/functional2/lang/function-autoargs/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-autoargs.nix
rename to tests/functional2/lang/function-autoargs/in.nix
diff --git a/tests/functional2/lang/function-autoargs/test.toml b/tests/functional2/lang/function-autoargs/test.toml
new file mode 100644
index 000000000..5099a98ad
--- /dev/null
+++ b/tests/functional2/lang/function-autoargs/test.toml
@@ -0,0 +1,3 @@
+[[test]]
+runner = "eval-okay"
+flags = [ "--arg", "lib", "import(./lib.nix)", "--argstr", "xyzzy", "xyzzy!", "-A", "result" ]