diff --git a/cmd/cli/kubectl-kyverno/apply/apply_command_test.go b/cmd/cli/kubectl-kyverno/apply/apply_command_test.go
index b5e4652b8d..d2f9bdb10e 100644
--- a/cmd/cli/kubectl-kyverno/apply/apply_command_test.go
+++ b/cmd/cli/kubectl-kyverno/apply/apply_command_test.go
@@ -176,8 +176,8 @@ func Test_Apply(t *testing.T) {
 		},
 		{
 			config: ApplyCommandConfig{
-				PolicyPaths:   []string{"../../../../test/cli/test-vap/check-deployments-replica/policy.yaml"},
-				ResourcePaths: []string{"../../../../test/cli/test-vap/check-deployments-replica/deployment1.yaml"},
+				PolicyPaths:   []string{"../../../../test/cli/test-validating-admission-policy/check-deployments-replica/policy.yaml"},
+				ResourcePaths: []string{"../../../../test/cli/test-validating-admission-policy/check-deployments-replica/deployment1.yaml"},
 				PolicyReport:  true,
 			},
 			expectedPolicyReports: []preport.PolicyReport{
@@ -194,8 +194,8 @@ func Test_Apply(t *testing.T) {
 		},
 		{
 			config: ApplyCommandConfig{
-				PolicyPaths:   []string{"../../../../test/cli/test-vap/check-deployments-replica/policy.yaml"},
-				ResourcePaths: []string{"../../../../test/cli/test-vap/check-deployments-replica/deployment2.yaml"},
+				PolicyPaths:   []string{"../../../../test/cli/test-validating-admission-policy/check-deployments-replica/policy.yaml"},
+				ResourcePaths: []string{"../../../../test/cli/test-validating-admission-policy/check-deployments-replica/deployment2.yaml"},
 				PolicyReport:  true,
 			},
 			expectedPolicyReports: []preport.PolicyReport{
@@ -212,8 +212,8 @@ func Test_Apply(t *testing.T) {
 		},
 		{
 			config: ApplyCommandConfig{
-				PolicyPaths:   []string{"../../../../test/cli/test-vap/disallow-host-path/policy.yaml"},
-				ResourcePaths: []string{"../../../../test/cli/test-vap/disallow-host-path/pod1.yaml"},
+				PolicyPaths:   []string{"../../../../test/cli/test-validating-admission-policy/disallow-host-path/policy.yaml"},
+				ResourcePaths: []string{"../../../../test/cli/test-validating-admission-policy/disallow-host-path/pod1.yaml"},
 				PolicyReport:  true,
 			},
 			expectedPolicyReports: []preport.PolicyReport{
@@ -230,8 +230,8 @@ func Test_Apply(t *testing.T) {
 		},
 		{
 			config: ApplyCommandConfig{
-				PolicyPaths:   []string{"../../../../test/cli/test-vap/disallow-host-path/policy.yaml"},
-				ResourcePaths: []string{"../../../../test/cli/test-vap/disallow-host-path/pod2.yaml"},
+				PolicyPaths:   []string{"../../../../test/cli/test-validating-admission-policy/disallow-host-path/policy.yaml"},
+				ResourcePaths: []string{"../../../../test/cli/test-validating-admission-policy/disallow-host-path/pod2.yaml"},
 				PolicyReport:  true,
 			},
 			expectedPolicyReports: []preport.PolicyReport{
diff --git a/test/cli/test-vap/check-deployments-replica/deployment1.yaml b/test/cli/test-validating-admission-policy/check-deployments-replica/deployment1.yaml
similarity index 100%
rename from test/cli/test-vap/check-deployments-replica/deployment1.yaml
rename to test/cli/test-validating-admission-policy/check-deployments-replica/deployment1.yaml
diff --git a/test/cli/test-vap/check-deployments-replica/deployment2.yaml b/test/cli/test-validating-admission-policy/check-deployments-replica/deployment2.yaml
similarity index 100%
rename from test/cli/test-vap/check-deployments-replica/deployment2.yaml
rename to test/cli/test-validating-admission-policy/check-deployments-replica/deployment2.yaml
diff --git a/test/cli/test-vap/check-deployments-replica/policy.yaml b/test/cli/test-validating-admission-policy/check-deployments-replica/policy.yaml
similarity index 100%
rename from test/cli/test-vap/check-deployments-replica/policy.yaml
rename to test/cli/test-validating-admission-policy/check-deployments-replica/policy.yaml
diff --git a/test/cli/test-vap/disallow-host-path/pod1.yaml b/test/cli/test-validating-admission-policy/disallow-host-path/pod1.yaml
similarity index 100%
rename from test/cli/test-vap/disallow-host-path/pod1.yaml
rename to test/cli/test-validating-admission-policy/disallow-host-path/pod1.yaml
diff --git a/test/cli/test-vap/disallow-host-path/pod2.yaml b/test/cli/test-validating-admission-policy/disallow-host-path/pod2.yaml
similarity index 100%
rename from test/cli/test-vap/disallow-host-path/pod2.yaml
rename to test/cli/test-validating-admission-policy/disallow-host-path/pod2.yaml
diff --git a/test/cli/test-vap/disallow-host-path/policy.yaml b/test/cli/test-validating-admission-policy/disallow-host-path/policy.yaml
similarity index 100%
rename from test/cli/test-vap/disallow-host-path/policy.yaml
rename to test/cli/test-validating-admission-policy/disallow-host-path/policy.yaml