diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
index b23a66f8fe9..015de894f7f 100644
--- a/.github/workflows/build-x86-image.yaml
+++ b/.github/workflows/build-x86-image.yaml
@@ -1492,7 +1492,7 @@ jobs:
           sudo cp -r /root/.kube/ ~/.kube/
           sudo chown -R $(id -un). ~/.kube/
 
-      - name: Install Kube-OVN
+      - name: Install Kube-OVN and KubeVirt
         run: make kind-install-kubevirt
 
       - name: Run E2E
diff --git a/Makefile b/Makefile
index 5ce0299ffe2..a39532d7af4 100644
--- a/Makefile
+++ b/Makefile
@@ -761,14 +761,15 @@ kind-install-kubevirt: kind-install
 
 	kubectl apply -f "$(KUBEVIRT_OPERATOR_YAML)"
 	kubectl apply -f "$(KUBEVIRT_CR_YAML)"
-	kubectl rollout status deployment/virt-operator -n kubevirt --timeout 120s
-	echo "wait kubevirt releated pod running ..."
-	sleep 60
-
 	kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch '{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true}}}}'
+	$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-operator)
+	$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-api)
+	$(call kubectl_wait_exist_and_ready,kubevirt,deployment,virt-controller)
+	$(call kubectl_wait_exist_and_ready,kubevirt,daemonset,virt-handler)
+
 	kubectl apply -f "$(KUBEVIRT_TEST_YAML)"
-	sleep 5
 	kubectl patch vm testvm --type=merge --patch '{"spec":{"running":true}}'
+	kubectl wait vm testvm --for=condition=Ready --timeout=2m
 
 .PHONY: kind-install-lb-svc
 kind-install-lb-svc:
diff --git a/test/e2e/kubevirt/e2e_test.go b/test/e2e/kubevirt/e2e_test.go
index 0751cdc7a1a..368057c3c10 100644
--- a/test/e2e/kubevirt/e2e_test.go
+++ b/test/e2e/kubevirt/e2e_test.go
@@ -47,7 +47,7 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 			LabelSelector: "vm.kubevirt.io/name=testvm",
 		})
 		framework.ExpectNoError(err)
-		framework.ExpectEqual(len(podList.Items), 1)
+		framework.ExpectHaveLen(podList.Items, 1)
 
 		ginkgo.By("Validating pod annotations")
 		pod := podList.Items[0]
@@ -65,7 +65,7 @@ var _ = framework.Describe("[group:kubevirt]", func() {
 			LabelSelector: "vm.kubevirt.io/name=testvm",
 		})
 		framework.ExpectNoError(err)
-		framework.ExpectEqual(len(podList.Items), 1)
+		framework.ExpectHaveLen(podList.Items, 1)
 
 		ginkgo.By("Validating new pod annotations")
 		pod = podList.Items[0]