diff --git a/cli/adapter/PndAdapter.go b/cli/adapter/PndAdapter.go
index 5797e250f13acd9555a5f6ab683f50846e2d0054..e1bd8936b36c5d83acf88f005f878d38e808a406 100644
--- a/cli/adapter/PndAdapter.go
+++ b/cli/adapter/PndAdapter.go
@@ -119,7 +119,6 @@ func (p *PndAdapter) RequestAll(ctx context.Context, path string) ([]proto.Messa
 	reqResult := make([]proto.Message, len(resp.Mne))
 	g := new(errgroup.Group)
 	for i, mne := range resp.Mne {
-		i, mne := i, mne
 		// TODO: probably the controller should do this; this would result in a
 		// single request from CLI side.
 		g.Go(func() error {
diff --git a/controller/version/version_test.go b/controller/version/version_test.go
index 9ae0dbaa713c0c7129782c425491bbcaab8281aa..127151d3d20651b9860c629a55e35872268923b8 100644
--- a/controller/version/version_test.go
+++ b/controller/version/version_test.go
@@ -294,7 +294,6 @@ func Test_version_Compare(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got := v.Compare(tt.args.inputVersion)
@@ -385,7 +384,6 @@ func Test_version_compareVersionSegment(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got := compareVersionSegment(tt.args.left, tt.args.right)
@@ -451,7 +449,6 @@ func Test_version_parseVersionString(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			got, err := parseVersionString(tt.args.input)