diff --git a/subscription_filter_test.go b/subscription_filter_test.go
index 7ee54a8..0057cdc 100644
--- a/subscription_filter_test.go
+++ b/subscription_filter_test.go
@@ -19,15 +19,15 @@ func TestBasicSubscriptionFilter(t *testing.T) {
 	topic3 := "test3"
 	yes := true
 	subs := []*pb.RPC_SubOpts{
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic1,
 			Subscribe: &yes,
 		},
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic2,
 			Subscribe: &yes,
 		},
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic3,
 			Subscribe: &yes,
 		},
@@ -108,24 +108,24 @@ func TestSubscriptionFilterDeduplication(t *testing.T) {
 	yes := true
 	no := false
 	subs := []*pb.RPC_SubOpts{
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic1,
 			Subscribe: &yes,
 		},
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic1,
 			Subscribe: &yes,
 		},
 
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic2,
 			Subscribe: &yes,
 		},
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic2,
 			Subscribe: &no,
 		},
-		&pb.RPC_SubOpts{
+		{
 			Topicid:   &topic3,
 			Subscribe: &yes,
 		},
diff --git a/validation_builtin_test.go b/validation_builtin_test.go
index 267cc6b..bca8774 100644
--- a/validation_builtin_test.go
+++ b/validation_builtin_test.go
@@ -246,7 +246,7 @@ func (r *replayActor) replay(msg *pb.Message) {
 
 		var peers []peer.ID
 		r.mx.Lock()
-		for p, _ := range r.out {
+		for p := range r.out {
 			if rng.Intn(2) > 0 {
 				peers = append(peers, p)
 			}