diff --git a/model/version.go b/model/version.go
index 6fc625b95b..8f783a17ae 100644
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"5.16.0",
 	"5.15.0",
 	"5.14.0",
 	"5.13.0",
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index e118f4e2a6..b6e43f20c8 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -20,6 +20,7 @@ import (
 )
 
 const (
+	CURRENT_SCHEMA_VERSION   = VERSION_5_15_0
 	VERSION_5_16_0           = "5.16.0"
 	VERSION_5_15_0           = "5.15.0"
 	VERSION_5_14_0           = "5.14.0"
diff --git a/store/sqlstore/upgrade_test.go b/store/sqlstore/upgrade_test.go
index eae894eff4..47c2dc3075 100644
--- a/store/sqlstore/upgrade_test.go
+++ b/store/sqlstore/upgrade_test.go
@@ -6,7 +6,6 @@ package sqlstore
 import (
 	"testing"
 
-	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/store"
 	"github.com/stretchr/testify/require"
 )
@@ -36,25 +35,25 @@ func TestStoreUpgrade(t *testing.T) {
 
 		t.Run("upgrade from earliest supported version", func(t *testing.T) {
 			saveSchemaVersion(sqlStore, VERSION_3_0_0)
-			err := UpgradeDatabase(sqlStore, model.CurrentVersion)
+			err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
 			require.NoError(t, err)
-			require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
+			require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
 		})
 
 		t.Run("upgrade from no existing version", func(t *testing.T) {
 			saveSchemaVersion(sqlStore, "")
-			err := UpgradeDatabase(sqlStore, model.CurrentVersion)
+			err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
 			require.NoError(t, err)
-			require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
+			require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
 		})
 
 		t.Run("upgrade schema running earlier minor version", func(t *testing.T) {
 			saveSchemaVersion(sqlStore, "5.1.0")
 			err := UpgradeDatabase(sqlStore, "5.8.0")
 			require.NoError(t, err)
-			// Assert model.CurrentVersion, not 5.8.0, since the migrations will move
+			// Assert CURRENT_SCHEMA_VERSION, not 5.8.0, since the migrations will move
 			// past 5.8.0 regardless of the input parameter.
-			require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
+			require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
 		})
 
 		t.Run("upgrade schema running later minor version", func(t *testing.T) {
@@ -66,9 +65,9 @@ func TestStoreUpgrade(t *testing.T) {
 
 		t.Run("upgrade schema running earlier major version", func(t *testing.T) {
 			saveSchemaVersion(sqlStore, "4.1.0")
-			err := UpgradeDatabase(sqlStore, model.CurrentVersion)
+			err := UpgradeDatabase(sqlStore, CURRENT_SCHEMA_VERSION)
 			require.NoError(t, err)
-			require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
+			require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
 		})
 
 		t.Run("upgrade schema running later major version", func(t *testing.T) {
@@ -94,12 +93,12 @@ func TestSaveSchemaVersion(t *testing.T) {
 		})
 
 		t.Run("set current version", func(t *testing.T) {
-			saveSchemaVersion(sqlStore, model.CurrentVersion)
+			saveSchemaVersion(sqlStore, CURRENT_SCHEMA_VERSION)
 			props, err := ss.System().Get()
 			require.Nil(t, err)
 
-			require.Equal(t, model.CurrentVersion, props["Version"])
-			require.Equal(t, model.CurrentVersion, sqlStore.GetCurrentSchemaVersion())
+			require.Equal(t, CURRENT_SCHEMA_VERSION, props["Version"])
+			require.Equal(t, CURRENT_SCHEMA_VERSION, sqlStore.GetCurrentSchemaVersion())
 		})
 	})
 }