diff --git a/cmd/fleetctl/convert_test.go b/cmd/fleetctl/convert_test.go
index 6903d24221..655911e7c7 100644
--- a/cmd/fleetctl/convert_test.go
+++ b/cmd/fleetctl/convert_test.go
@@ -41,6 +41,7 @@ func TestConvertFileOutput(t *testing.T) {
 
 func TestConvertFileStdout(t *testing.T) {
 	r, w, _ := os.Pipe()
+	oldStdout := os.Stdout
 	os.Stdout = w
 
 	// setup the cli and the convert command
@@ -60,6 +61,7 @@ func TestConvertFileStdout(t *testing.T) {
 	err = app.Run(args)
 	require.NoError(t, err)
 
+	os.Stdout = oldStdout
 	w.Close()
 	out, _ := ioutil.ReadAll(r)
 	require.Equal(t, expected, out)
diff --git a/cmd/fleetctl/trigger_test.go b/cmd/fleetctl/trigger_test.go
index 08f36838a3..f6c68a603f 100644
--- a/cmd/fleetctl/trigger_test.go
+++ b/cmd/fleetctl/trigger_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/fleetdm/fleet/v4/server/service"
 	"github.com/fleetdm/fleet/v4/server/service/schedule"
 	kitlog "github.com/go-kit/kit/log"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -50,6 +49,7 @@ func TestTrigger(t *testing.T) {
 	}
 
 	r, w, _ := os.Pipe()
+	oldStdout := os.Stdout
 	os.Stdout = w
 
 	_, _ = runServerWithMockedDS(t, &service.TestServerOpts{
@@ -78,6 +78,7 @@ func TestTrigger(t *testing.T) {
 		assert.Equal(t, "", runAppForTest(t, c.args))
 	}
 
+	os.Stdout = oldStdout
 	w.Close()
 	out, _ := ioutil.ReadAll(r)
 	outlines := strings.Split(string(out), "\n")