diff --git a/cli/templatelist_test.go b/cli/templatelist_test.go
index f562d3f2b9f06..c113dc7e4f0b1 100644
--- a/cli/templatelist_test.go
+++ b/cli/templatelist_test.go
@@ -49,7 +49,7 @@ func TestTemplateList(t *testing.T) {
 	})
 	t.Run("NoTemplates", func(t *testing.T) {
 		t.Parallel()
-		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+		client := coderdtest.New(t, &coderdtest.Options{})
 		coderdtest.CreateFirstUser(t, client)
 
 		cmd, root := clitest.New(t, "templates", "list")
@@ -66,6 +66,8 @@ func TestTemplateList(t *testing.T) {
 
 		require.NoError(t, <-errC)
 
-		pty.ExpectMatch("No templates found in testuser! Create one:")
+		pty.ExpectMatch("No templates found in")
+		pty.ExpectMatch(coderdtest.FirstUserParams.Username)
+		pty.ExpectMatch("Create one:")
 	})
 }