diff --git a/pkg/router/contour.go b/pkg/router/contour.go
index c7e05b90..9b2678ee 100644
--- a/pkg/router/contour.go
+++ b/pkg/router/contour.go
@@ -283,11 +283,7 @@ func (cr *ContourRouter) SetRoutes(
 }
 
 func (cr *ContourRouter) makeConditions(canary *flaggerv1.Canary) []contourv1.Condition {
-	list := []contourv1.Condition{
-		{
-			Prefix: "/",
-		},
-	}
+	list := []contourv1.Condition{}
 
 	if len(canary.Spec.CanaryAnalysis.Match) > 0 {
 		for _, match := range canary.Spec.CanaryAnalysis.Match {
@@ -308,9 +304,15 @@ func (cr *ContourRouter) makeConditions(canary *flaggerv1.Canary) []contourv1.Co
 						Contains: stringMatch.Prefix,
 					}
 				}
-				list = append(list, contourv1.Condition{Header: h})
+				list = append(list, contourv1.Condition{Prefix: "/", Header: h})
 			}
 		}
+	} else {
+		list = []contourv1.Condition{
+			{
+				Prefix: "/",
+			},
+		}
 	}
 
 	return list
diff --git a/pkg/router/contour_test.go b/pkg/router/contour_test.go
new file mode 100644
index 00000000..fb03e8d1
--- /dev/null
+++ b/pkg/router/contour_test.go
@@ -0,0 +1,101 @@
+package router
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestContourRouter_Reconcile(t *testing.T) {
+	mocks := setupfakeClients()
+	router := &ContourRouter{
+		logger:        mocks.logger,
+		flaggerClient: mocks.flaggerClient,
+		contourClient: mocks.meshClient,
+		kubeClient:    mocks.kubeClient,
+	}
+
+	// init
+	err := router.Reconcile(mocks.canary)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	// test insert
+	proxy, err := router.contourClient.ProjectcontourV1().HTTPProxies("default").Get("podinfo", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	services := proxy.Spec.Routes[0].Services
+	if len(services) != 2 {
+		t.Errorf("Got Services %v wanted %v", len(services), 2)
+	}
+
+	if services[0].Weight != 100 {
+		t.Errorf("Primary weight should is %v wanted 100", services[0].Weight)
+	}
+	if services[1].Weight != 0 {
+		t.Errorf("Canary weight should is %v wanted 0", services[0].Weight)
+	}
+
+	// test port update
+	cd, err := mocks.flaggerClient.FlaggerV1alpha3().Canaries("default").Get("podinfo", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	cdClone := cd.DeepCopy()
+	cdClone.Spec.Service.Port = 8080
+	canary, err := mocks.flaggerClient.FlaggerV1alpha3().Canaries("default").Update(cdClone)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	// apply change
+	err = router.Reconcile(canary)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	proxy, err = router.contourClient.ProjectcontourV1().HTTPProxies("default").Get("podinfo", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	port := proxy.Spec.Routes[0].Services[0].Port
+
+	if port != 8080 {
+		t.Errorf("Service port is %v wanted %v", port, 8080)
+	}
+
+	// test headers update
+	cd, err = mocks.flaggerClient.FlaggerV1alpha3().Canaries("default").Get("podinfo", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	cdClone = cd.DeepCopy()
+	cdClone.Spec.CanaryAnalysis.Iterations = 5
+	cdClone.Spec.CanaryAnalysis.Match = newMockABTest().Spec.CanaryAnalysis.Match
+	canary, err = mocks.flaggerClient.FlaggerV1alpha3().Canaries("default").Update(cdClone)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	// apply change
+	err = router.Reconcile(canary)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	proxy, err = router.contourClient.ProjectcontourV1().HTTPProxies("default").Get("podinfo", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+
+	header := proxy.Spec.Routes[0].Conditions[0].Header.Exact
+	if header != "test" {
+		t.Errorf("Route header condition is %v wanted %v", header, "test")
+	}
+}