diff --git a/discovery/kv/kv.go b/discovery/kv/kv.go
index e58553140e..d8158f5e53 100644
--- a/discovery/kv/kv.go
+++ b/discovery/kv/kv.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/docker/swarm/discovery"
 	"github.com/docker/swarm/pkg/store"
 )
@@ -72,6 +73,7 @@ func (s *Discovery) Fetch() ([]*discovery.Entry, error) {
 // Watch is exported
 func (s *Discovery) Watch(callback discovery.WatchCallback) {
 	s.store.WatchTree(s.prefix, func(kv ...*store.KVPair) {
+		log.WithField("name", s.backend).Debug("Discovery watch triggered")
 		// Traduce byte array entries to discovery.Entry
 		entries, _ := discovery.CreateEntries(convertToStringArray(kv))
 		callback(entries)
diff --git a/pkg/store/consul.go b/pkg/store/consul.go
index 1078af3e58..d4525acfc7 100644
--- a/pkg/store/consul.go
+++ b/pkg/store/consul.go
@@ -156,7 +156,6 @@ func (s *Consul) Watch(key string, callback WatchCallback) error {
 	eventChan := s.waitForChange(fkey)
 
 	for _ = range eventChan {
-		log.WithField("name", "consul").Debug("Key watch triggered")
 		entry, err := s.Get(key)
 		if err != nil {
 			log.Error("Cannot refresh the key: ", fkey, ", cancelling watch")
@@ -197,7 +196,7 @@ func (s *Consul) waitForChange(key string) <-chan uint64 {
 			}
 			_, meta, err := kv.List(key, option)
 			if err != nil {
-				log.WithField("name", "consul").Errorf("Discovery error: %v", err)
+				log.WithField("name", "consul").Error(err)
 				break
 			}
 			watch.LastIndex = meta.LastIndex
@@ -223,7 +222,6 @@ func (s *Consul) WatchTree(prefix string, callback WatchCallback) error {
 	eventChan := s.waitForChange(fprefix)
 
 	for _ = range eventChan {
-		log.WithField("name", "consul").Debug("Key watch triggered")
 		kvi, err := s.List(prefix)
 		if err != nil {
 			log.Error("Cannot refresh keys with prefix: ", fprefix, ", cancelling watch")
diff --git a/pkg/store/etcd.go b/pkg/store/etcd.go
index 29b4a5e887..e51cd094ac 100644
--- a/pkg/store/etcd.go
+++ b/pkg/store/etcd.go
@@ -148,7 +148,6 @@ func (s *Etcd) Watch(key string, callback WatchCallback) error {
 	go s.client.Watch(key, 0, false, watchChan, stopChan)
 
 	for _ = range watchChan {
-		log.WithField("name", "etcd").Debug("Discovery watch triggered")
 		entry, err := s.Get(key)
 		if err != nil {
 			log.Error("Cannot refresh the key: ", key, ", cancelling watch")
@@ -227,7 +226,6 @@ func (s *Etcd) WatchTree(prefix string, callback WatchCallback) error {
 	// Start watch
 	go s.client.Watch(prefix, 0, true, watchChan, stopChan)
 	for _ = range watchChan {
-		log.WithField("name", "etcd").Debug("Discovery watch triggered")
 		kvi, err := s.List(prefix)
 		if err != nil {
 			log.Error("Cannot refresh the key: ", prefix, ", cancelling watch")
diff --git a/pkg/store/zookeeper.go b/pkg/store/zookeeper.go
index 0e54b7452e..a312771362 100644
--- a/pkg/store/zookeeper.go
+++ b/pkg/store/zookeeper.go
@@ -115,7 +115,6 @@ func (s *Zookeeper) Watch(key string, callback WatchCallback) error {
 
 	for e := range eventChan {
 		if e.Type == zk.EventNodeChildrenChanged {
-			log.WithField("name", "zk").Debug("Discovery watch triggered")
 			entry, err := s.Get(key)
 			if err == nil {
 				callback(entry)
@@ -173,7 +172,6 @@ func (s *Zookeeper) WatchTree(prefix string, callback WatchCallback) error {
 
 	for e := range eventChan {
 		if e.Type == zk.EventNodeChildrenChanged {
-			log.WithField("name", "zk").Debug("Discovery watch triggered")
 			kvi, err := s.List(prefix)
 			if err == nil {
 				callback(kvi...)