diff --git a/e2e/addon/mock/utils/utils.go b/e2e/addon/mock/utils/utils.go
index 4a3425c2d..49e05a673 100644
--- a/e2e/addon/mock/utils/utils.go
+++ b/e2e/addon/mock/utils/utils.go
@@ -76,17 +76,20 @@ func ApplyMockServerConfig() error {
 	} else {
 		cm.ResourceVersion = originCm.ResourceVersion
 		if err = k8sClient.Update(ctx, &cm); err != nil {
-			fmt.Println("print errr------")
-			fmt.Println(err)
 			return err
 		}
 	}
 	if err := k8sClient.Create(ctx, &v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "test-vela"}}); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
 		return err
 	}
 	otherRegistry.SetNamespace("test-vela")
 	if err := k8sClient.Create(ctx, otherRegistry); err != nil {
-		return err
+		if !apierrors.IsAlreadyExists(err) {
+			return err
+		}
 	}
 	return nil
 }
diff --git a/e2e/addon/mock/vela_addon_mock_server.go b/e2e/addon/mock/vela_addon_mock_server.go
index b06f085c1..98faa56dd 100644
--- a/e2e/addon/mock/vela_addon_mock_server.go
+++ b/e2e/addon/mock/vela_addon_mock_server.go
@@ -44,7 +44,7 @@ var (
 func main() {
 	err := utils.ApplyMockServerConfig()
 	if err != nil {
-		log.Fatal("Apply mock server config to ConfigMap fail")
+		log.Fatal(err)
 	}
 	http.HandleFunc("/", ossHandler)
 	http.HandleFunc("/helm/", helmHandler)
diff --git a/test/e2e-apiserver-test/addon_test.go b/test/e2e-apiserver-test/addon_test.go
index 6e2d4cecb..48c9707c7 100644
--- a/test/e2e-apiserver-test/addon_test.go
+++ b/test/e2e-apiserver-test/addon_test.go
@@ -146,20 +146,23 @@ var _ = Describe("Test addon rest api", func() {
 					"testkey": "new-testvalue",
 				},
 			}
-			res := put("/addons/mock-addon/update", req)
-			defer res.Body.Close()
-			var addonStatus apisv1.AddonStatusResponse
-			Expect(decodeResponseBody(res, &addonStatus)).Should(Succeed())
-			Expect(addonStatus.Name).Should(BeEquivalentTo("mock-addon"))
-			Expect(len(addonStatus.Args)).Should(BeEquivalentTo(1))
-			Expect(addonStatus.Args["testkey"]).Should(BeEquivalentTo("new-testvalue"))
+			Eventually(func(g Gomega) {
+				res := put("/addons/mock-addon/update", req)
+				defer res.Body.Close()
+				var addonStatus apisv1.AddonStatusResponse
+				g.Expect(decodeResponseBody(res, &addonStatus)).Should(Succeed())
+				g.Expect(addonStatus.Name).Should(BeEquivalentTo("mock-addon"))
+				g.Expect(len(addonStatus.Args)).Should(BeEquivalentTo(1))
+				g.Expect(addonStatus.Args["testkey"]).Should(BeEquivalentTo("new-testvalue"))
+
+				status := get("/addons/mock-addon/status")
+				var newaddonStatus apisv1.AddonStatusResponse
+				g.Expect(decodeResponseBody(status, &newaddonStatus)).Should(Succeed())
+				g.Expect(newaddonStatus.Name).Should(BeEquivalentTo("mock-addon"))
+				g.Expect(len(newaddonStatus.Args)).Should(BeEquivalentTo(1))
+				g.Expect(newaddonStatus.Args["testkey"]).Should(BeEquivalentTo("new-testvalue"))
+			}, 15*time.Second).Should(Succeed())
 
-			status := get("/addons/mock-addon/status")
-			var newaddonStatus apisv1.AddonStatusResponse
-			Expect(decodeResponseBody(status, &newaddonStatus)).Should(Succeed())
-			Expect(newaddonStatus.Name).Should(BeEquivalentTo("mock-addon"))
-			Expect(len(newaddonStatus.Args)).Should(BeEquivalentTo(1))
-			Expect(newaddonStatus.Args["testkey"]).Should(BeEquivalentTo("new-testvalue"))
 		})
 
 		It("list enabled addon", func() {