diff --git a/pkg/monitor/cluster/maintenance_test.go b/pkg/monitor/cluster/maintenance_test.go
index 06ed7e558da..87f3207f06c 100644
--- a/pkg/monitor/cluster/maintenance_test.go
+++ b/pkg/monitor/cluster/maintenance_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/golang/mock/gomock"
 
 	"github.com/Azure/ARO-RP/pkg/api"
+	"github.com/Azure/ARO-RP/pkg/metrics"
 	mock_metrics "github.com/Azure/ARO-RP/pkg/util/mocks/metrics"
 )
 
@@ -27,10 +28,7 @@ func TestEmitPucmState(t *testing.T) {
 			ProvisioningState: api.ProvisioningStateAdminUpdating,
 		},
 	}
-	mon := &Monitor{
-		m:  m,
-		oc: oc,
-	}
+	mon := getMonitor(oc, m)
 	m.EXPECT().EmitGauge("cluster.maintenance.pucm", int64(1), map[string]string{
 		"state": pucmUnplannedOngoing.String(),
 	})
@@ -47,7 +45,7 @@ func TestEmitPucmState(t *testing.T) {
 			PucmPending:       true,
 		},
 	}
-
+	mon = getMonitor(oc, m)
 	m.EXPECT().EmitGauge("cluster.maintenance.pucm", int64(1), map[string]string{
 		"state": pucmPlannedOngoing.String(),
 	})
@@ -64,7 +62,7 @@ func TestEmitPucmState(t *testing.T) {
 			PucmPending:       true,
 		},
 	}
-
+	mon = getMonitor(oc, m)
 	m.EXPECT().EmitGauge("cluster.maintenance.pucm", int64(1), map[string]string{
 		"state": pucmPending.String(),
 	})
@@ -80,7 +78,7 @@ func TestEmitPucmState(t *testing.T) {
 			ProvisioningState: api.ProvisioningStateSucceeded,
 		},
 	}
-
+	mon = getMonitor(oc, m)
 	m.EXPECT().EmitGauge("cluster.maintenance.pucm", int64(1), map[string]string{
 		"state": pucmNone.String(),
 	})
@@ -90,3 +88,10 @@ func TestEmitPucmState(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func getMonitor(oc *api.OpenShiftCluster, m metrics.Emitter) *Monitor {
+	return &Monitor{
+		m:  m,
+		oc: oc,
+	}
+}