diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go
index d9d5f41c15..167de8c693 100644
--- a/store/storetest/user_store.go
+++ b/store/storetest/user_store.go
@@ -2764,7 +2764,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 	ch1 := model.Channel{
 		TeamId:      tid,
 		DisplayName: "NameName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(&ch1, -1)
@@ -2773,7 +2773,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 	ch2 := model.Channel{
 		TeamId:      tid,
 		DisplayName: "NameName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Type:        model.ChannelTypeOpen,
 	}
 	c2, nErr := ss.Channel().Save(&ch2, -1)
@@ -2993,7 +2993,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 	ch1 := model.Channel{
 		TeamId:      tid,
 		DisplayName: "NameName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(&ch1, -1)
@@ -3002,7 +3002,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 	ch2 := model.Channel{
 		TeamId:      tid,
 		DisplayName: "NameName",
-		Name:        "zz" + model.NewId() + "b",
+		Name:        NewTestId(),
 		Type:        model.ChannelTypeOpen,
 	}
 	c2, nErr := ss.Channel().Save(&ch2, -1)
@@ -4186,7 +4186,7 @@ func testUserStoreAnalyticsGetExternalUsers(t *testing.T, ss store.Store) {
 func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 	team, err := ss.Team().Save(&model.Team{
 		DisplayName: "Team",
-		Name:        "zz" + model.NewId(),
+		Name:        NewTestId(),
 		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
@@ -4498,7 +4498,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) {
 	// Set up all the objects needed
 	t1, err := ss.Team().Save(&model.Team{
 		DisplayName: "Team1",
-		Name:        "zz" + model.NewId(),
+		Name:        NewTestId(),
 		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)