diff --git a/leases/lease_test.go b/leases/lease_test.go
index 2c92e697b..c436f002b 100644
--- a/leases/lease_test.go
+++ b/leases/lease_test.go
@@ -24,60 +24,47 @@ import (
 )
 
 func TestWithLabels(t *testing.T) {
-	type unitTest struct {
+	testcases := []struct {
 		name     string
 		uut      *Lease
 		labels   map[string]string
 		expected map[string]string
-	}
-
-	addLabelsToEmptyMap := &unitTest{
-		name: "AddLabelsToEmptyMap",
-		uut:  &Lease{},
-		labels: map[string]string{
-			"containerd.io/gc.root": "2015-12-04T00:00:00Z",
-		},
-		expected: map[string]string{
-			"containerd.io/gc.root": "2015-12-04T00:00:00Z",
-		},
-	}
-
-	addLabelsToNonEmptyMap := &unitTest{
-		name: "AddLabelsToNonEmptyMap",
-		uut: &Lease{
-			Labels: map[string]string{
-				"containerd.io/gc.expire": "2015-12-05T00:00:00Z",
+	}{
+		{
+			name: "AddLabelsToEmptyMap",
+			uut:  &Lease{},
+			labels: map[string]string{
+				"containerd.io/gc.root": "2015-12-04T00:00:00Z",
+			},
+			expected: map[string]string{
+				"containerd.io/gc.root": "2015-12-04T00:00:00Z",
 			},
 		},
-		labels: map[string]string{
-			"containerd.io/gc.root":                   "2015-12-04T00:00:00Z",
-			"containerd.io/gc.ref.snapshot.overlayfs": "sha256:87806a591ce894ff5c699c28fe02093d6cdadd6b1ad86819acea05ccb212ff3d",
-		},
-		expected: map[string]string{
-			"containerd.io/gc.root":                   "2015-12-04T00:00:00Z",
-			"containerd.io/gc.ref.snapshot.overlayfs": "sha256:87806a591ce894ff5c699c28fe02093d6cdadd6b1ad86819acea05ccb212ff3d",
-			"containerd.io/gc.expire":                 "2015-12-05T00:00:00Z",
+		{
+			name: "AddLabelsToNonEmptyMap",
+			uut: &Lease{
+				Labels: map[string]string{
+					"containerd.io/gc.expire": "2015-12-05T00:00:00Z",
+				},
+			},
+			labels: map[string]string{
+				"containerd.io/gc.root":                   "2015-12-04T00:00:00Z",
+				"containerd.io/gc.ref.snapshot.overlayfs": "sha256:87806a591ce894ff5c699c28fe02093d6cdadd6b1ad86819acea05ccb212ff3d",
+			},
+			expected: map[string]string{
+				"containerd.io/gc.root":                   "2015-12-04T00:00:00Z",
+				"containerd.io/gc.ref.snapshot.overlayfs": "sha256:87806a591ce894ff5c699c28fe02093d6cdadd6b1ad86819acea05ccb212ff3d",
+				"containerd.io/gc.expire":                 "2015-12-05T00:00:00Z",
+			},
 		},
 	}
 
-	testcases := []*unitTest{
-		addLabelsToEmptyMap,
-		addLabelsToNonEmptyMap,
-	}
-
-	for _, testcase := range testcases {
-		testcase := testcase
-
-		t.Run(testcase.name, func(t *testing.T) {
-			f := WithLabels(testcase.labels)
-
-			err := f(testcase.uut)
+	for _, tc := range testcases {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			err := WithLabels(tc.labels)(tc.uut)
 			require.NoError(t, err)
-
-			for k, v := range testcase.expected {
-				assert.Contains(t, testcase.uut.Labels, k)
-				assert.Equal(t, v, testcase.uut.Labels[k])
-			}
+			assert.Equal(t, tc.uut.Labels, tc.expected)
 		})
 	}
 }