diff --git a/cli/templatecreate.go b/cli/templatecreate.go
index 4cc92e95b856b..5a03ff12677ac 100644
--- a/cli/templatecreate.go
+++ b/cli/templatecreate.go
@@ -79,8 +79,8 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
 				return err
 			}
 
-			if utf8.RuneCountInString(templateName) > 31 {
-				return xerrors.Errorf("Template name must be less than 32 characters")
+			if utf8.RuneCountInString(templateName) > 32 {
+				return xerrors.Errorf("Template name must be no more than 32 characters")
 			}
 
 			_, err = client.TemplateByName(inv.Context(), organization.ID, templateName)
diff --git a/cli/templatepush.go b/cli/templatepush.go
index c1099a67bdf92..e0e1e689c4017 100644
--- a/cli/templatepush.go
+++ b/cli/templatepush.go
@@ -56,8 +56,8 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
 				return err
 			}
 
-			if utf8.RuneCountInString(name) >= 32 {
-				return xerrors.Errorf("Template name must be less than 32 characters")
+			if utf8.RuneCountInString(name) > 32 {
+				return xerrors.Errorf("Template name must be no more than 32 characters")
 			}
 
 			var createTemplate bool