diff --git a/tests/docker/lazypull/lazypull_test.go b/tests/docker/lazypull/lazypull_test.go
index 796f26efcf..47f3c470be 100644
--- a/tests/docker/lazypull/lazypull_test.go
+++ b/tests/docker/lazypull/lazypull_test.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 
@@ -28,8 +27,7 @@ var _ = Describe("LazyPull Tests", Ordered, func() {
 			var err error
 			config, err = tester.NewTestConfig(*k3sImage)
 			Expect(err).NotTo(HaveOccurred())
-
-			Expect(os.Setenv("SERVER_ARGS", "--snapshotter=stargz")).To(Succeed())
+			config.ServerYaml = "snapshotter: stargz"
 			Expect(config.ProvisionServers(1)).To(Succeed())
 			Eventually(func() error {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
@@ -121,7 +119,10 @@ func lookLayers(node, layer string) error {
 func getTopmostLayer(node, container string) (string, error) {
 	var targetContainer string
 	cmd := fmt.Sprintf("docker exec -i %s ctr --namespace=k8s.io c ls -q labels.\"io.kubernetes.container.name\"==\"%s\" | sed -n 1p", node, container)
-	targetContainer, _ = tester.RunCommand(cmd)
+	targetContainer, err := tester.RunCommand(cmd)
+	if err != nil {
+		return "", fmt.Errorf("failed to get target container: %v", err)
+	}
 	targetContainer = strings.TrimSpace(targetContainer)
 	fmt.Println("targetContainer: ", targetContainer)
 	if targetContainer == "" {
diff --git a/tests/docker/test-helpers.go b/tests/docker/test-helpers.go
index ece890b45c..8d7bf2aeac 100644
--- a/tests/docker/test-helpers.go
+++ b/tests/docker/test-helpers.go
@@ -183,8 +183,9 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error {
 				os.Getenv("SERVER_DOCKER_ARGS"),
 				os.Getenv(fmt.Sprintf("SERVER_%d_DOCKER_ARGS", i)),
 				os.Getenv("REGISTRY_CLUSTER_ARGS"),
+				yamlMount,
 				serverImage,
-				"server", joinOrStart, os.Getenv("SERVER_ARGS"), os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i))}, " ")
+				"server", joinOrStart, os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i))}, " ")
 			if out, err := RunCommand(dRun); err != nil {
 				return fmt.Errorf("failed to run server container: %s: %v", out, err)
 			}
@@ -271,7 +272,7 @@ func (config *TestConfig) ProvisionAgents(numOfAgents int) error {
 					os.Getenv(fmt.Sprintf("AGENT_%d_DOCKER_ARGS", i)),
 					os.Getenv("REGISTRY_CLUSTER_ARGS"),
 					getEnvOrDefault("K3S_IMAGE_AGENT", config.K3sImage),
-					"agent", os.Getenv("ARGS"), os.Getenv("AGENT_ARGS"), os.Getenv(agentInstanceArgs)}, " ")
+					"agent", os.Getenv("ARGS"), os.Getenv(agentInstanceArgs)}, " ")
 
 				if out, err := RunCommand(dRun); err != nil {
 					return fmt.Errorf("failed to run agent container: %s: %v", out, err)