From 1190b529959d63ff6844b6a070284ba7d3ef2f2b Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Wed, 18 Feb 2026 09:49:24 +0100
Subject: [PATCH] use centralized arguments collection in test

---
 internal/command/test.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/internal/command/test.go b/internal/command/test.go
index 95cfe6d027..f9aaf6b8e8 100644
--- a/internal/command/test.go
+++ b/internal/command/test.go
@@ -392,8 +392,19 @@ func (m *Meta) setupTestExecution(mode moduletest.CommandMode, command string, r
 	preparation.TestVariables, moreDiags = m.collectVariableValuesForTests(preparation.Args.TestDirectory)
 	diags = diags.Append(moreDiags)
 
-	preparation.Variables, moreDiags = m.collectVariableValues()
-	diags = diags.Append(moreDiags)
+	loader, err := m.initConfigLoader()
+	if err != nil {
+		diags = diags.Append(err)
+		view.Diagnostics(nil, nil, diags)
+		return
+	}
+
+	// Collect variable value and add them to the operation request
+	var varDiags tfdiags.Diagnostics
+	preparation.Variables, varDiags = preparation.Args.Vars.CollectValues(func(filename string, src []byte) {
+		loader.Parser().ForceFileSource(filename, src)
+	})
+	diags = diags.Append(varDiags)
 	if diags.HasErrors() {
 		view.Diagnostics(nil, nil, diags)
 		return