diff --git a/net/ip_test.go b/net/ip_test.go
index f2b39a3a3efa13178710f1289ad8cb50e1dc33e0..28b3bbfb6a71bbda2bba59f2a09bfceb30930e4d 100644
--- a/net/ip_test.go
+++ b/net/ip_test.go
@@ -141,9 +141,9 @@ func TestIPFromProtoIP(t *testing.T) {
 		},
 	}
 
-	for _, test := range tests {
-		res := IPFromProtoIP(&test.proto)
-		assert.Equal(t, test.expected, res, test.name)
+	for i := range tests {
+		res := IPFromProtoIP(&tests[i].proto)
+		assert.Equal(t, tests[i].expected, res, tests[i].name)
 	}
 }
 
diff --git a/net/prefix_test.go b/net/prefix_test.go
index 7c961ee4a7edfca45f25318d230dc670a867f633..3a72b024299438739a3f1a887b62ead6a4e75fe7 100644
--- a/net/prefix_test.go
+++ b/net/prefix_test.go
@@ -153,9 +153,9 @@ func TestNewPrefixFromProtoPrefix(t *testing.T) {
 		},
 	}
 
-	for _, test := range tests {
-		res := NewPrefixFromProtoPrefix(&test.proto)
-		assert.Equal(t, test.expected, *res, test.name)
+	for i := range tests {
+		res := NewPrefixFromProtoPrefix(&tests[i].proto)
+		assert.Equal(t, tests[i].expected, *res, tests[i].name)
 	}
 }
 
diff --git a/protocols/bgp/server/fsm_address_family_test.go b/protocols/bgp/server/fsm_address_family_test.go
index ac6a0e075295cc1fad7af17054d6d083f49fb978..45b9412a52f41e3be4d03762cd1180b404489a0a 100644
--- a/protocols/bgp/server/fsm_address_family_test.go
+++ b/protocols/bgp/server/fsm_address_family_test.go
@@ -50,7 +50,7 @@ func TestFSMAFIInitDispose(t *testing.T) {
 
 	wg := sync.WaitGroup{}
 	wg.Add(1)
-	assert.Equal(t, wg, f.updateSender.wg)
+	assert.EqualValues(t, &wg, &f.updateSender.wg)
 
 	assert.Equal(t, uint64(1), f.adjRIBOut.ClientCount())