diff --git a/pkg/ddl/tests/partition/multi_domain_test.go b/pkg/ddl/tests/partition/multi_domain_test.go
index 3bd2242283..e116357d2d 100644
--- a/pkg/ddl/tests/partition/multi_domain_test.go
+++ b/pkg/ddl/tests/partition/multi_domain_test.go
@@ -25,6 +25,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pingcap/tidb/pkg/config/kerneltype"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/kv"
 	"github.com/pingcap/tidb/pkg/meta/model"
@@ -1294,6 +1295,10 @@ func TestMultiSchemaReorganizeNoPKBackfillDML(t *testing.T) {
 // TestMultiSchemaTruncatePartitionWithGlobalIndex to show behavior when
 // truncating a partition with a global index
 func TestMultiSchemaTruncatePartitionWithGlobalIndex(t *testing.T) {
+	if kerneltype.IsNextGen() {
+		// TODO(tangenta): fix this test
+		t.Skip("Skip this test temporarily for next-gen, will fix it later")
+	}
 	// TODO: Also test non-int PK, multi-column PK
 	createSQL := `create table t (a int primary key, b varchar(255), c varchar(255) default 'Filler', unique key uk_b (b) global) partition by hash (a) partitions 2`
 	initFn := func(tkO *testkit.TestKit) {
diff --git a/pkg/session/test/bootstraptest/bootstrap_upgrade_test.go b/pkg/session/test/bootstraptest/bootstrap_upgrade_test.go
index 40d6cdd4d7..68c262cc00 100644
--- a/pkg/session/test/bootstraptest/bootstrap_upgrade_test.go
+++ b/pkg/session/test/bootstraptest/bootstrap_upgrade_test.go
@@ -903,49 +903,57 @@ func TestUpgradeWithCrossJoinDisabled(t *testing.T) {
 	}()
 }
 
-func TestUpgradeVersion245Primary(t *testing.T) {
+func TestUpgradeBDRPrimary(t *testing.T) {
+	fromVersion := 244
+	if kerneltype.IsNextGen() {
+		fromVersion = 250
+	}
 	store, dom := session.CreateStoreAndBootstrap(t)
 	defer func() { require.NoError(t, store.Close()) }()
-	seV244 := session.CreateSessionAndSetID(t, store)
+	seVLow := session.CreateSessionAndSetID(t, store)
 	txn, err := store.Begin()
 	require.NoError(t, err)
 	m := meta.NewMutator(txn)
-	err = m.FinishBootstrap(int64(244))
+	err = m.FinishBootstrap(int64(fromVersion))
 	require.NoError(t, err)
 	err = txn.Commit(context.Background())
-	revertVersionAndVariables(t, seV244, 244)
+	revertVersionAndVariables(t, seVLow, fromVersion)
 	require.NoError(t, err)
-	session.MustExec(t, seV244, "ADMIN SET BDR ROLE PRIMARY")
+	session.MustExec(t, seVLow, "ADMIN SET BDR ROLE PRIMARY")
 	store.SetOption(session.StoreBootstrappedKey, nil)
-	ver, err := session.GetBootstrapVersion(seV244)
+	ver, err := session.GetBootstrapVersion(seVLow)
 	require.NoError(t, err)
-	require.Equal(t, int64(244), ver)
+	require.Equal(t, int64(fromVersion), ver)
 	dom.Close()
 	newVer, err := session.BootstrapSession(store)
 	require.NoError(t, err)
-	ver, err = session.GetBootstrapVersion(seV244)
+	ver, err = session.GetBootstrapVersion(seVLow)
 	require.NoError(t, err)
 	require.Equal(t, session.CurrentBootstrapVersion, ver)
 	newVer.Close()
 }
 
-func TestUpgradeVersion245Secondary(t *testing.T) {
+func TestUpgradeBDRSecondary(t *testing.T) {
+	fromVersion := 244
+	if kerneltype.IsNextGen() {
+		fromVersion = 250
+	}
 	store, dom := session.CreateStoreAndBootstrap(t)
 	defer func() { require.NoError(t, store.Close()) }()
 	seV244 := session.CreateSessionAndSetID(t, store)
 	txn, err := store.Begin()
 	require.NoError(t, err)
 	m := meta.NewMutator(txn)
-	err = m.FinishBootstrap(int64(244))
+	err = m.FinishBootstrap(int64(fromVersion))
 	require.NoError(t, err)
 	err = txn.Commit(context.Background())
-	revertVersionAndVariables(t, seV244, 244)
+	revertVersionAndVariables(t, seV244, fromVersion)
 	require.NoError(t, err)
 	session.MustExec(t, seV244, "ADMIN SET BDR ROLE SECONDARY")
 	store.SetOption(session.StoreBootstrappedKey, nil)
 	ver, err := session.GetBootstrapVersion(seV244)
 	require.NoError(t, err)
-	require.Equal(t, int64(244), ver)
+	require.Equal(t, int64(fromVersion), ver)
 	dom.Close()
 	newVer, err := session.BootstrapSession(store)
 	require.NoError(t, err)