diff --git a/manager/manager_test.go b/manager/manager_test.go
index efa33816..fc92e155 100644
--- a/manager/manager_test.go
+++ b/manager/manager_test.go
@@ -115,7 +115,7 @@ func expectManagerWithContainers(containers []string, query *info.ContainerInfoR
 			h.On("GetSpec").Return(
 				spec,
 				nil,
-			)
+			).Once()
 			handlerMap[h.Name] = h
 		},
 		t,
@@ -216,10 +216,9 @@ func TestGetContainerInfoV2Failure(t *testing.T) {
 
 	// Make GetSpec fail on /c2
 	mockErr := fmt.Errorf("intentional GetSpec failure")
-	failingHandler := containertest.NewMockContainerHandler(failing)
-	failingHandler.On("GetSpec").Return(info.ContainerSpec{}, mockErr)
-	failingHandler.On("Exists").Return(true)
-	*handlerMap[failing] = *failingHandler
+	handlerMap[failing].GetSpec() // Use up default GetSpec call, and replace below
+	handlerMap[failing].On("GetSpec").Return(info.ContainerSpec{}, mockErr)
+	handlerMap[failing].On("Exists").Return(true)
 	m.containers[namespacedContainerName{Name: failing}].lastUpdatedTime = time.Time{} // Force GetSpec.
 
 	infos, err := m.GetContainerInfoV2("/", options)