diff --git a/internal/api/util/client/zs3_client.go b/internal/api/util/client/zs3_client.go
index 51edb2845d..99ace9f7c1 100644
--- a/internal/api/util/client/zs3_client.go
+++ b/internal/api/util/client/zs3_client.go
@@ -41,7 +41,7 @@ func (c *ZS3Client) BucketOperation(t *test.SystemTest, queryParams, formData ma
 func createForm(form map[string]string) (string, io.Reader, error) {
 	body := new(bytes.Buffer)
 	mp := multipart.NewWriter(body)
-	defer mp.Close()
+	defer mp.Close() //nolint:errcheck
 	for key, val := range form {
 		if strings.HasPrefix(val, "@") {
 			val = val[1:]
@@ -49,7 +49,7 @@ func createForm(form map[string]string) (string, io.Reader, error) {
 			if err != nil {
 				return "", nil, err
 			}
-			defer file.Close() //nolint:gocritic
+			defer file.Close() //nolint:gocritic,errcheck
 			part, err := mp.CreateFormFile(key, val)
 			if err != nil {
 				return "", nil, err
diff --git a/internal/cli/util/api_get_list.go b/internal/cli/util/api_get_list.go
index b5bfcfdcb2..f74d2b023f 100644
--- a/internal/cli/util/api_get_list.go
+++ b/internal/cli/util/api_get_list.go
@@ -36,7 +36,7 @@ func ApiGetError[T any](url string, params map[string]string) (*T, error) {
 		return nil, fmt.Errorf("with request %s, %v", url, err)
 	}
 
-	defer res.Body.Close()
+	defer res.Body.Close() //nolint:errcheck
 	if res.StatusCode < 200 && res.StatusCode >= 300 {
 		return nil, fmt.Errorf("failed API request %s, status code: %d: %v", url, res.StatusCode, err)
 	}
@@ -62,7 +62,7 @@ func ApiGet[T any](t *test.SystemTest, url string, params map[string]string) *T
 	res, err := http.Get(url) //nolint:gosec
 
 	require.NoError(t, err, "with request", url)
-	defer res.Body.Close()
+	defer res.Body.Close() //nolint:errcheck
 	require.True(t, res.StatusCode >= 200 && res.StatusCode < 300,
 		"failed API request %s, status code: %d", url, res.StatusCode)
 	require.NotNil(t, res.Body, "API response must not be nil")
@@ -107,7 +107,7 @@ func getNext(t *test.SystemTest, url string, from, to, limit, offset int64, para
 	res, err := http.Get(url) //nolint:gosec
 
 	require.NoError(t, err, "retrieving blocks %d to %d", from, to)
-	defer res.Body.Close()
+	defer res.Body.Close() //nolint:errcheck
 	require.True(t, res.StatusCode >= 200 && res.StatusCode < 300,
 		"failed API request to get blocks %d to %d, status code: %d", from, to, res.StatusCode)
 	require.NotNil(t, res.Body, "balance API response must not be nil")
diff --git a/internal/cli/util/utils.go b/internal/cli/util/utils.go
index 56041fdfbe..d86cddfa96 100644
--- a/internal/cli/util/utils.go
+++ b/internal/cli/util/utils.go
@@ -295,7 +295,7 @@ func ReadFile(testSetup *testing.T) Configuration {
 	if err != nil {
 		testSetup.Fatalf("Error opening hosts.yaml file: %v\n", err)
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	decoder := yaml.NewDecoder(file)
 	var hosts map[string]interface{}
@@ -322,7 +322,7 @@ func ReadFileAllocation() (data, parity, lock, accessKey, secretKey string) {
 	if err != nil {
 		log.Fatalf("Error opening allocation.yaml file: %v", err)
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	decoder := yaml.NewDecoder(file)
 	var allocationData map[string]interface{}
@@ -348,7 +348,7 @@ func AppendToFile(filename, data string) error {
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	if _, err := file.WriteString(data); err != nil {
 		return err
@@ -399,7 +399,7 @@ func GetAllocationID(path string) string {
 	if err != nil {
 		log.Printf("Error opening allocation.txt file: %v", err)
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	scanner := bufio.NewScanner(file)
 	scanner.Scan()
@@ -414,7 +414,7 @@ func ReadFileMC(testSetup *testing.T) McConfiguration {
 	if err != nil {
 		testSetup.Fatalf("Error opening hosts.yaml file: %v\n", err)
 	}
-	defer file.Close()
+	defer file.Close() //nolint:errcheck
 
 	decoder := yaml.NewDecoder(file)
 	var hosts map[string]interface{}
diff --git a/tests/api_tests/get_latest_finalized_magic_block_test.go b/tests/api_tests/get_latest_finalized_magic_block_test.go
index 5153031571..ddb7f69a0f 100644
--- a/tests/api_tests/get_latest_finalized_magic_block_test.go
+++ b/tests/api_tests/get_latest_finalized_magic_block_test.go
@@ -61,7 +61,7 @@ func TestGetLatestFinalizedMagicBlock(testSetup *testing.T) {
 func getCurrentHash(t *test.SystemTest) (string, error) {
 	resp, err := http.Get(apiClient.HealthyServiceProviders.Sharders[0] + "/v1/block/get/latest_finalized_magic_block")
 	require.Nil(t, err)
-	defer resp.Body.Close()
+	defer resp.Body.Close() //nolint:errcheck
 
 	var res map[string]interface{}
 	decoder := json.NewDecoder(resp.Body)
diff --git a/tests/cli_tests/mc_tests/1_basic_operations_test.go b/tests/cli_tests/mc_tests/1_basic_operations_test.go
index da07134020..0764675154 100644
--- a/tests/cli_tests/mc_tests/1_basic_operations_test.go
+++ b/tests/cli_tests/mc_tests/1_basic_operations_test.go
@@ -45,7 +45,7 @@ func TestZs3Server(testSetup *testing.T) {
 		if err != nil {
 			t.Fatalf("Error creating file: %v", err)
 		}
-		defer file.Close()
+		defer file.Close() //nolint:errcheck
 
 		_, err = file.WriteString("test")
 		if err != nil {
@@ -56,7 +56,7 @@ func TestZs3Server(testSetup *testing.T) {
 
 		assert.NotContains(t, output, "../mc: <ERROR>")
 
-		os.Remove("a.txt")
+		os.Remove("a.txt") //nolint:errcheck
 	})
 
 	t.RunSequentially("Test for moving file", func(t *test.SystemTest) {
@@ -66,7 +66,7 @@ func TestZs3Server(testSetup *testing.T) {
 		if err != nil {
 			t.Fatalf("Error creating file: %v", err)
 		}
-		defer file.Close()
+		defer file.Close() //nolint:errcheck
 
 		_, err = file.WriteString("test")
 		if err != nil {
diff --git a/tests/cli_tests/mc_tests/2_bucket_to_bucket_test.go b/tests/cli_tests/mc_tests/2_bucket_to_bucket_test.go
index a61f39e1eb..2505a93d2e 100644
--- a/tests/cli_tests/mc_tests/2_bucket_to_bucket_test.go
+++ b/tests/cli_tests/mc_tests/2_bucket_to_bucket_test.go
@@ -1,5 +1,7 @@
 package cli_tests
 
+//nolint:errcheck // defer statements for cleanup don't need error handling
+
 import (
 	"fmt"
 	"os"
diff --git a/tests/cli_tests/mc_tests/3_replication_disaster_recovery_test.go b/tests/cli_tests/mc_tests/3_replication_disaster_recovery_test.go
index 54c6ea7346..8fa43f2501 100644
--- a/tests/cli_tests/mc_tests/3_replication_disaster_recovery_test.go
+++ b/tests/cli_tests/mc_tests/3_replication_disaster_recovery_test.go
@@ -1,5 +1,7 @@
 package cli_tests
 
+//nolint:errcheck // defer statements for cleanup don't need error handling
+
 import (
 	"os"
 	"strings"
diff --git a/tests/cli_tests/zboxcli_download_livestream_test.go b/tests/cli_tests/zboxcli_download_livestream_test.go
index 78ddf716df..37f12e5520 100644
--- a/tests/cli_tests/zboxcli_download_livestream_test.go
+++ b/tests/cli_tests/zboxcli_download_livestream_test.go
@@ -1,5 +1,7 @@
 package cli_tests
 
+//nolint:errcheck // defer statements for cleanup don't need error handling
+
 import (
 	"crypto/md5" //nolint:gosec
 	"encoding/hex"
diff --git a/tests/cli_tests/zboxcli_restricted_blobber_test.go b/tests/cli_tests/zboxcli_restricted_blobber_test.go
index 348b519cbc..e5e4a83acb 100644
--- a/tests/cli_tests/zboxcli_restricted_blobber_test.go
+++ b/tests/cli_tests/zboxcli_restricted_blobber_test.go
@@ -3,7 +3,6 @@ package cli_tests
 import (
 	"encoding/hex"
 	"encoding/json"
-	"github.com/0chain/errors"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -14,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/0chain/errors"
+
 	"github.com/0chain/common/core/common"
 	"github.com/0chain/gosdk/core/zcncrypto"
 
@@ -361,7 +362,7 @@ func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberURL, clientID st
 	if err != nil {
 		return authTicket, err
 	}
-	defer resp.Body.Close()
+	defer resp.Body.Close() //nolint:errcheck
 	var responseMap map[string]string
 	err = json.NewDecoder(resp.Body).Decode(&responseMap)
 	if err != nil {
@@ -371,7 +372,7 @@ func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberURL, clientID st
 	}
 	authTicket = responseMap["auth_ticket"]
 	if authTicket == "" {
-		common.NewError("500", "Error getting auth ticket from blobber")
+		_ = common.NewError("500", "Error getting auth ticket from blobber")
 	}
 	return authTicket, nil
 }
diff --git a/tests/cli_tests/zboxcli_share_file_test.go b/tests/cli_tests/zboxcli_share_file_test.go
index 106d5f4b3c..82b53099a7 100644
--- a/tests/cli_tests/zboxcli_share_file_test.go
+++ b/tests/cli_tests/zboxcli_share_file_test.go
@@ -1,5 +1,7 @@
 package cli_tests
 
+//nolint:errcheck // defer statements for cleanup don't need error handling
+
 import (
 	"encoding/hex"
 	"fmt"
diff --git a/tests/cli_tests/zboxcli_sync_test.go b/tests/cli_tests/zboxcli_sync_test.go
index 17e3a3aecd..685d235644 100644
--- a/tests/cli_tests/zboxcli_sync_test.go
+++ b/tests/cli_tests/zboxcli_sync_test.go
@@ -1,5 +1,7 @@
 package cli_tests
 
+//nolint:errcheck // defer statements for cleanup don't need error handling
+
 import (
 	"encoding/json"
 	"fmt"
diff --git a/tests/tokenomics_tests/utils/blobbers.go b/tests/tokenomics_tests/utils/blobbers.go
index 899a02d1fe..bbd2f079e2 100644
--- a/tests/tokenomics_tests/utils/blobbers.go
+++ b/tests/tokenomics_tests/utils/blobbers.go
@@ -152,7 +152,7 @@ func getBlobberAuthTicket(t *test.SystemTest, cliConfigFileName, blobberID, blob
 	if err != nil {
 		return authTicket, err
 	}
-	defer resp.Body.Close()
+	defer resp.Body.Close() //nolint:errcheck
 	var responseMap map[string]string
 	err = json.NewDecoder(resp.Body).Decode(&responseMap)
 	if err != nil {