diff --git a/tasks_tools.yaml b/tasks_tools.yaml
index 2b78362..b69a0e0 100644
--- a/tasks_tools.yaml
+++ b/tasks_tools.yaml
@@ -179,6 +179,7 @@ tasks:
     - localbin
     vars:
       ENVTEST_VERSION: '{{ env "ENVTEST_VERSION" | default ( .ENVTEST_VERSION | default "release-0.16" ) }}'
+      ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0"" ) }}'
     status:
     - 'test -x "{{.ENVTEST}}"'
     - test -f {{.LOCALBIN}}/envtest_version
@@ -186,4 +187,5 @@ tasks:
     cmds:
     - 'GOBIN="{{.LOCALBIN}}" go install sigs.k8s.io/controller-runtime/tools/setup-envtest@{{.ENVTEST_VERSION}}'
     - echo -n "{{.ENVTEST_VERSION}}" > {{.LOCALBIN}}/envtest_version
+    - '{{.ROOT_DIR}}/bin/setup-envtest use {{.ENVTEST_K8S_VERSION}} -p path > {{.LOCALBIN}}/assets_path'
     internal: true
diff --git a/tasks_val.yaml b/tasks_val.yaml
index 36312c3..6e5264d 100644
--- a/tasks_val.yaml
+++ b/tasks_val.yaml
@@ -23,13 +23,15 @@ tasks:
   test:
     desc: "  Run all tests."
     run: once
+    vars:
+      ENVTEST_K8S_VERSION: '{{ env "ENVTEST_K8S_VERSION" | default ( .ENVTEST_K8S_VERSION | default "1.30.0" ) }}'
     requires:
       vars:
       - CODE_DIRS
     deps:
     - test-envtest-dep
     cmds:
-    - 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}'
+    - 'PROJECT_ROOT="{{.ROOT_DIR2}}" NESTED_MODULES="{{.NESTED_MODULES}}" KUBEBUILDER_ASSETS="$( (test -f {{.LOCALBIN}}/assets_path && cat {{.LOCALBIN}}/assets_path) || echo "")" ENVTEST_K8S_VERSION="{{.ENVTEST_K8S_VERSION}}" {{.TASKFILE_DIR2}}/run-tests.sh {{.CODE_DIRS}}'
 
   test-envtest-dep:
     desc: "  Install the envtest dependency, if marked as required."