diff --git a/hscontrol/db/node_test.go b/hscontrol/db/node_test.go
index c3b95f97..10c87e95 100644
--- a/hscontrol/db/node_test.go
+++ b/hscontrol/db/node_test.go
@@ -202,8 +202,7 @@ func (s *Suite) TestListPeersWithoutNonAuthorized(c *check.C) {
 		}
 
 		node := types.Node{
-			// nolint:G115
-			ID:             types.NodeID(uint64(index)),
+			ID:             types.NodeID(uint64(index)), // nolint:G115
 			MachineKey:     machineKey.Public(),
 			NodeKey:        nodeKey.Public(),
 			Hostname:       "testnode" + strconv.Itoa(index),
diff --git a/integration/cli_test.go b/integration/cli_test.go
index 94b5f348..dd2c8c27 100644
--- a/integration/cli_test.go
+++ b/integration/cli_test.go
@@ -1303,7 +1303,7 @@ func TestNodeApproveCommand(t *testing.T) {
 				strconv.FormatUint(listAll[idx].GetId(), 10),
 			},
 		)
-		assert.NoError(t, err)
+		assertNoErr(t, err)
 	}
 
 	var listAllAfterApprove []v1.Node
@@ -1318,7 +1318,7 @@ func TestNodeApproveCommand(t *testing.T) {
 		},
 		&listAllAfterApprove,
 	)
-	assert.NoError(t, err)
+	assertNoErr(t, err)
 
 	assert.Len(t, listAllAfterApprove, 5)