diff --git a/server/channels/testlib/helper.go b/server/channels/testlib/helper.go
index a5b431d43b..bd50adccd9 100644
--- a/server/channels/testlib/helper.go
+++ b/server/channels/testlib/helper.go
@@ -171,7 +171,12 @@ func (h *MainHelper) PreloadMigrations() {
 
 	basePath := os.Getenv("MM_SERVER_PATH")
 	if basePath == "" {
-		basePath = "mattermost-server/server"
+		_, errFile := os.Stat("mattermost-server/server")
+		if os.IsNotExist(errFile) {
+			basePath = "mattermost/server"
+		} else {
+			basePath = "mattermost-server/server"
+		}
 	}
 	relPath := "channels/testlib/testdata"
 	switch *h.Settings.DriverName {
@@ -213,7 +218,12 @@ func (h *MainHelper) PreloadBoardsMigrationsIfNeeded() {
 
 	basePath := os.Getenv("MM_SERVER_PATH")
 	if basePath == "" {
-		basePath = "mattermost-server/server"
+		_, errFile := os.Stat("mattermost-server/server")
+		if os.IsNotExist(errFile) {
+			basePath = "mattermost/server"
+		} else {
+			basePath = "mattermost-server/server"
+		}
 	}
 	relPath := "channels/testlib/testdata"