diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
index 89fd024b0c33a..b8e4147e6bab4 100644
--- a/cli/templatepush_test.go
+++ b/cli/templatepush_test.go
@@ -534,7 +534,7 @@ func TestTemplatePush(t *testing.T) {
 						"test_name": tt.name,
 					}))
 
-					templateName := strings.ReplaceAll(testutil.GetRandomName(t), "_", "-")
+					templateName := testutil.GetRandomNameHyphenated(t)
 
 					inv, root := clitest.New(t, "templates", "push", templateName, "-d", tempDir, "--yes")
 					clitest.SetupConfig(t, templateAdmin, root)
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
index 4e3e3d2f7f2b0..433441fdd4cf9 100644
--- a/coderd/templateversions_test.go
+++ b/coderd/templateversions_test.go
@@ -617,7 +617,7 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) {
 				require.NoError(t, err)
 
 				// Create a template version from the archive
-				tvName := strings.ReplaceAll(testutil.GetRandomName(t), "_", "-")
+				tvName := testutil.GetRandomNameHyphenated(t)
 				tv, err := templateAdmin.CreateTemplateVersion(ctx, owner.OrganizationID, codersdk.CreateTemplateVersionRequest{
 					Name:            tvName,
 					StorageMethod:   codersdk.ProvisionerStorageMethodFile,
diff --git a/testutil/names.go b/testutil/names.go
index ee182ed50b68d..e53e854fae239 100644
--- a/testutil/names.go
+++ b/testutil/names.go
@@ -2,6 +2,7 @@ package testutil
 
 import (
 	"strconv"
+	"strings"
 	"sync/atomic"
 	"testing"
 
@@ -25,6 +26,14 @@ func GetRandomName(t testing.TB) string {
 	return incSuffix(name, n.Add(1), maxNameLen)
 }
 
+// GetRandomNameHyphenated is as GetRandomName but uses a hyphen "-" instead of
+// an underscore.
+func GetRandomNameHyphenated(t testing.TB) string {
+	t.Helper()
+	name := namesgenerator.GetRandomName(0)
+	return strings.ReplaceAll(name, "_", "-")
+}
+
 func incSuffix(s string, num int64, maxLen int) string {
 	suffix := strconv.FormatInt(num, 10)
 	if len(s)+len(suffix) <= maxLen {