diff --git a/.golangci.yml b/.golangci.yml
index 33a993a42..1ac50f4cf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -68,4 +68,3 @@ linters-settings:
     disable:
     - fieldalignment
     - reflectvaluecompare
-    - shadow
diff --git a/endpoint_broadcast_test.go b/endpoint_broadcast_test.go
index 0716dacb7..341841c30 100644
--- a/endpoint_broadcast_test.go
+++ b/endpoint_broadcast_test.go
@@ -51,8 +51,8 @@ func TestEndpointBroadcast(t *testing.T) {
 	rw, err := frame.NewReadWriter(frame.ReadWriterConf{
 		ReadWriter: &readWriterFromFuncs{
 			readFunc: func(p []byte) (int, error) {
-				n, _, err := pc.ReadFrom(p)
-				return n, err
+				n, _, err2 := pc.ReadFrom(p)
+				return n, err2
 			},
 			writeFunc: func(p []byte) (int, error) {
 				return pc.WriteTo(p, &net.UDPAddr{
diff --git a/endpoint_client_test.go b/endpoint_client_test.go
index 165565fa5..96023b714 100644
--- a/endpoint_client_test.go
+++ b/endpoint_client_test.go
@@ -147,22 +147,22 @@ func TestEndpointClientIdleTimeout(t *testing.T) {
 			reconnected := make(chan struct{})
 
 			go func() {
-				conn, err := ln.Accept()
-				require.NoError(t, err)
+				conn, err2 := ln.Accept()
+				require.NoError(t, err2)
 
-				dialectRW, err := dialect.NewReadWriter(testDialect)
-				require.NoError(t, err)
+				dialectRW, err2 := dialect.NewReadWriter(testDialect)
+				require.NoError(t, err2)
 
-				rw, err := frame.NewReadWriter(frame.ReadWriterConf{
+				rw, err2 := frame.NewReadWriter(frame.ReadWriterConf{
 					ReadWriter:  conn,
 					DialectRW:   dialectRW,
 					OutVersion:  frame.V2,
 					OutSystemID: 11,
 				})
-				require.NoError(t, err)
+				require.NoError(t, err2)
 
-				fr, err := rw.Read()
-				require.NoError(t, err)
+				fr, err2 := rw.Read()
+				require.NoError(t, err2)
 				require.Equal(t, &frame.V2Frame{
 					SequenceNumber: 0,
 					SystemID:       10,
@@ -178,15 +178,15 @@ func TestEndpointClientIdleTimeout(t *testing.T) {
 					Checksum: fr.GetChecksum(),
 				}, fr)
 
-				_, err = rw.Read()
-				require.Equal(t, io.EOF, err)
+				_, err2 = rw.Read()
+				require.Equal(t, io.EOF, err2)
 				conn.Close()
 
 				close(closed)
 
 				// the client reconnects to the server due to autoReconnector
-				conn, err = ln.Accept()
-				require.NoError(t, err)
+				conn, err2 = ln.Accept()
+				require.NoError(t, err2)
 				conn.Close()
 
 				close(reconnected)
diff --git a/endpoint_server.go b/endpoint_server.go
index 48d43d04d..8f0201e2a 100644
--- a/endpoint_server.go
+++ b/endpoint_server.go
@@ -76,7 +76,8 @@ func initEndpointServer(node *Node, conf endpointServerConf) (Endpoint, error) {
 
 	var ln net.Listener
 	if conf.isUDP() {
-		addr, err := net.ResolveUDPAddr("udp4", conf.getAddress())
+		var addr *net.UDPAddr
+		addr, err = net.ResolveUDPAddr("udp4", conf.getAddress())
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/conversion/conversion.go b/pkg/conversion/conversion.go
index 55374f80f..71b45d3b2 100644
--- a/pkg/conversion/conversion.go
+++ b/pkg/conversion/conversion.go
@@ -631,7 +631,8 @@ func Convert(path string, link bool) error {
 	isRemote := (err == nil)
 	defName := defAddrToName(path)
 
-	if _, err := os.Stat(defName); !os.IsNotExist(err) {
+	_, err = os.Stat(defName)
+	if !os.IsNotExist(err) {
 		return fmt.Errorf("directory '%s' already exists", defName)
 	}