diff --git a/inttestutils/transfer.go b/inttestutils/transfer.go
index e53884abc..8d6ce6a72 100644
--- a/inttestutils/transfer.go
+++ b/inttestutils/transfer.go
@@ -98,7 +98,9 @@ func CountArtifactsInPath(pattern string, serverDetails *config.ServerDetails, t
 	searchCmd.SetServerDetails(serverDetails).SetSpec(spec.NewBuilder().Pattern(pattern).BuildSpec())
 	reader, err := searchCmd.Search()
 	assert.NoError(t, err)
-	defer assert.NoError(t, reader.Close())
+	defer func() {
+		assert.NoError(t, reader.Close())
+	}()
 	length, err := reader.Length()
 	assert.NoError(t, err)
 	return length
@@ -114,11 +116,11 @@ func WaitForCreationInArtifactory(pattern string, serverDetails *config.ServerDe
 	for i := 0; i < 20; i++ {
 		reader, err := searchCmd.Search()
 		assert.NoError(t, err)
-		defer assert.NoError(t, reader.Close())
 		if !reader.IsEmpty() {
 			return
 		}
 		time.Sleep(5 * time.Second)
+		assert.NoError(t, reader.Close())
 	}
 	assert.Fail(t, "Couldn't find in target Artifactory: "+pattern)
 }
diff --git a/npm_test.go b/npm_test.go
index d8a4e4c60..cebbf1199 100644
--- a/npm_test.go
+++ b/npm_test.go
@@ -438,7 +438,9 @@ func TestNpmPackInstall(t *testing.T) {
 	buildInfoService := utils.CreateBuildInfoService()
 	goBuild, err := buildInfoService.GetOrCreateBuild(tests.NpmBuildName, buildNumber)
 	assert.NoError(t, err)
-	defer assert.NoError(t, goBuild.Clean())
+	defer func() {
+		assert.NoError(t, goBuild.Clean())
+	}()
 	_, err = goBuild.ToBuildInfo()
 	assert.Error(t, err)
 }