diff --git a/ipfscluster_test.go b/ipfscluster_test.go
index 1c7ef8bc..effb4f0e 100644
--- a/ipfscluster_test.go
+++ b/ipfscluster_test.go
@@ -1073,7 +1073,9 @@ func TestClustersReplicationOverall(t *testing.T) {
 		}
 		if numLocal != nClusters-1 {
 			t.Errorf("Expected %d local pins but got %d", nClusters-1, numLocal)
-			t.Error(pinfos)
+			for _, pi := range pinfos {
+				t.Errorf("%+v", pi)
+			}
 		}
 
 		if numRemote != 1 {
diff --git a/monitor/metrics/checker.go b/monitor/metrics/checker.go
index 76eb2ac6..4488adee 100644
--- a/monitor/metrics/checker.go
+++ b/monitor/metrics/checker.go
@@ -63,9 +63,11 @@ func (mc *Checker) CheckPeers(peers []peer.ID) error {
 // and no alert has been sent before.
 func (mc Checker) CheckAll() error {
 	for _, metric := range mc.metrics.AllMetrics() {
-		err := mc.alertIfExpired(metric)
-		if err != nil {
-			return err
+		if mc.FailedMetric(metric.Name, metric.Peer) {
+			err := mc.alert(metric.Peer, metric.Name)
+			if err != nil {
+				return err
+			}
 		}
 	}