diff --git a/cli/server_createadminuser_test.go b/cli/server_createadminuser_test.go
index 7660d71e89..c0883a2d27 100644
--- a/cli/server_createadminuser_test.go
+++ b/cli/server_createadminuser_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"io"
 	"runtime"
 	"testing"
 
@@ -224,8 +225,7 @@ func TestServerCreateAdminUser(t *testing.T) {
 		}
 		connectionURL, err := dbtestutil.Open(t)
 		require.NoError(t, err)
-		ctx, cancelFunc := context.WithCancel(context.Background())
-		defer cancelFunc()
+		ctx := testutil.Context(t, testutil.WaitShort)
 
 		root, _ := clitest.New(t,
 			"server", "create-admin-user",
@@ -235,10 +235,7 @@ func TestServerCreateAdminUser(t *testing.T) {
 			"--email", "not-an-email",
 			"--password", "x",
 		)
-		pty := ptytest.New(t)
-		root.Stdout = pty.Output()
-		root.Stderr = pty.Output()
-
+		root.Stdout, root.Stderr = io.Discard, io.Discard
 		err = root.WithContext(ctx).Run()
 		require.Error(t, err)
 		require.ErrorContains(t, err, "'email' failed on the 'email' tag")