diff --git a/cli/debug/debug.go b/cli/debug/debug.go
index 1a9a46abcc..84002bd008 100644
--- a/cli/debug/debug.go
+++ b/cli/debug/debug.go
@@ -10,14 +10,14 @@ import (
 // Enable sets the DEBUG env var to true
 // and makes the logger to log at debug level.
 func Enable() {
-	os.Setenv("DEBUG", "1")
+	_ = os.Setenv("DEBUG", "1")
 	logrus.SetLevel(logrus.DebugLevel)
 }
 
 // Disable sets the DEBUG env var to false
 // and makes the logger to log at info level.
 func Disable() {
-	os.Setenv("DEBUG", "")
+	_ = os.Setenv("DEBUG", "")
 	logrus.SetLevel(logrus.InfoLevel)
 }
 
diff --git a/cli/debug/debug_test.go b/cli/debug/debug_test.go
index 903115283c..e8f156401f 100644
--- a/cli/debug/debug_test.go
+++ b/cli/debug/debug_test.go
@@ -9,9 +9,9 @@ import (
 
 func TestEnable(t *testing.T) {
 	defer func() {
-		os.Setenv("DEBUG", "")
 		logrus.SetLevel(logrus.InfoLevel)
 	}()
+	t.Setenv("DEBUG", "")
 	Enable()
 	if os.Getenv("DEBUG") != "1" {
 		t.Fatalf("expected DEBUG=1, got %s\n", os.Getenv("DEBUG"))
@@ -22,6 +22,7 @@ func TestEnable(t *testing.T) {
 }
 
 func TestDisable(t *testing.T) {
+	t.Setenv("DEBUG", "1")
 	Disable()
 	if os.Getenv("DEBUG") != "" {
 		t.Fatalf("expected DEBUG=\"\", got %s\n", os.Getenv("DEBUG"))
@@ -32,6 +33,7 @@ func TestDisable(t *testing.T) {
 }
 
 func TestEnabled(t *testing.T) {
+	t.Setenv("DEBUG", "")
 	Enable()
 	if !IsEnabled() {
 		t.Fatal("expected debug enabled, got false")