diff --git a/pkg/executor/BUILD.bazel b/pkg/executor/BUILD.bazel
index b0cac939a774f..247972dd8dbef 100644
--- a/pkg/executor/BUILD.bazel
+++ b/pkg/executor/BUILD.bazel
@@ -126,7 +126,7 @@ go_library(
         "//pkg/executor/lockstats",
         "//pkg/executor/metrics",
         "//pkg/executor/mppcoordmanager",
-        "//pkg/executor/sort_exec",
+        "//pkg/executor/sortexec",
         "//pkg/expression",
         "//pkg/expression/aggregation",
         "//pkg/infoschema",
@@ -380,7 +380,7 @@ go_test(
         "//pkg/executor/importer",
         "//pkg/executor/internal/builder",
         "//pkg/executor/internal/exec",
-        "//pkg/executor/sort_exec",
+        "//pkg/executor/sortexec",
         "//pkg/expression",
         "//pkg/expression/aggregation",
         "//pkg/infoschema",
diff --git a/pkg/executor/benchmark_test.go b/pkg/executor/benchmark_test.go
index 967b9cdb732a1..533faf835644e 100644
--- a/pkg/executor/benchmark_test.go
+++ b/pkg/executor/benchmark_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pingcap/tidb/pkg/executor/aggfuncs"
 	"github.com/pingcap/tidb/pkg/executor/aggregate"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
-	"github.com/pingcap/tidb/pkg/executor/sort_exec"
+	"github.com/pingcap/tidb/pkg/executor/sortexec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/expression/aggregation"
 	"github.com/pingcap/tidb/pkg/parser/ast"
@@ -1647,7 +1647,7 @@ func prepare4MergeJoin(tc *mergeJoinTestCase, innerDS, outerDS *mockDataSource,
 
 	var leftExec, rightExec exec.Executor
 	if sorted {
-		leftSortExec := &sort_exec.SortExec{
+		leftSortExec := &sortexec.SortExec{
 			BaseExecutor: exec.NewBaseExecutor(tc.ctx, innerDS.Schema(), 3, innerDS),
 			ByItems:      make([]*util.ByItems, 0, len(tc.innerJoinKeyIdx)),
 			ExecSchema:   innerDS.Schema(),
@@ -1657,7 +1657,7 @@ func prepare4MergeJoin(tc *mergeJoinTestCase, innerDS, outerDS *mockDataSource,
 		}
 		leftExec = leftSortExec
 
-		rightSortExec := &sort_exec.SortExec{
+		rightSortExec := &sortexec.SortExec{
 			BaseExecutor: exec.NewBaseExecutor(tc.ctx, outerDS.Schema(), 4, outerDS),
 			ByItems:      make([]*util.ByItems, 0, len(tc.outerJoinKeyIdx)),
 			ExecSchema:   outerDS.Schema(),
@@ -1918,7 +1918,7 @@ func benchmarkSortExec(b *testing.B, cas *sortCase) {
 		ndvs:   cas.ndvs,
 	}
 	dataSource := buildMockDataSource(opt)
-	executor := &sort_exec.SortExec{
+	executor := &sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(cas.ctx, dataSource.Schema(), 4, dataSource),
 		ByItems:      make([]*util.ByItems, 0, len(cas.orderByIdx)),
 		ExecSchema:   dataSource.Schema(),
diff --git a/pkg/executor/builder.go b/pkg/executor/builder.go
index 1bf4193dd1dc4..789e75134526b 100644
--- a/pkg/executor/builder.go
+++ b/pkg/executor/builder.go
@@ -47,7 +47,7 @@ import (
 	"github.com/pingcap/tidb/pkg/executor/internal/vecgroupchecker"
 	"github.com/pingcap/tidb/pkg/executor/lockstats"
 	executor_metrics "github.com/pingcap/tidb/pkg/executor/metrics"
-	"github.com/pingcap/tidb/pkg/executor/sort_exec"
+	"github.com/pingcap/tidb/pkg/executor/sortexec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/expression/aggregation"
 	"github.com/pingcap/tidb/pkg/infoschema"
@@ -1298,7 +1298,7 @@ func (b *executorBuilder) buildTrace(v *plannercore.Trace) exec.Executor {
 		optimizerTraceTarget: v.OptimizerTraceTarget,
 	}
 	if t.format == plannercore.TraceFormatLog && !t.optimizerTrace {
-		return &sort_exec.SortExec{
+		return &sortexec.SortExec{
 			BaseExecutor: exec.NewBaseExecutor(b.ctx, v.Schema(), v.ID(), t),
 			ByItems: []*plannerutil.ByItems{
 				{Expr: &expression.Column{
@@ -2246,7 +2246,7 @@ func (b *executorBuilder) buildSort(v *plannercore.PhysicalSort) exec.Executor {
 	if b.err != nil {
 		return nil
 	}
-	sortExec := sort_exec.SortExec{
+	sortExec := sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(b.ctx, v.Schema(), v.ID(), childExec),
 		ByItems:      v.ByItems,
 		ExecSchema:   v.Schema(),
@@ -2260,13 +2260,13 @@ func (b *executorBuilder) buildTopN(v *plannercore.PhysicalTopN) exec.Executor {
 	if b.err != nil {
 		return nil
 	}
-	sortExec := sort_exec.SortExec{
+	sortExec := sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(b.ctx, v.Schema(), v.ID(), childExec),
 		ByItems:      v.ByItems,
 		ExecSchema:   v.Schema(),
 	}
 	executor_metrics.ExecutorCounterTopNExec.Inc()
-	return &sort_exec.TopNExec{
+	return &sortexec.TopNExec{
 		SortExec: sortExec,
 		Limit:    &plannercore.PhysicalLimit{Count: v.Count, Offset: v.Offset},
 	}
diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go
index eecc14d158b06..53cf815415ca0 100644
--- a/pkg/executor/executor.go
+++ b/pkg/executor/executor.go
@@ -39,7 +39,7 @@ import (
 	"github.com/pingcap/tidb/pkg/executor/aggregate"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
 	"github.com/pingcap/tidb/pkg/executor/internal/pdhelper"
-	"github.com/pingcap/tidb/pkg/executor/sort_exec"
+	"github.com/pingcap/tidb/pkg/executor/sortexec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/infoschema"
 	"github.com/pingcap/tidb/pkg/kv"
@@ -103,12 +103,12 @@ var (
 	_ exec.Executor = &ShowDDLExec{}
 	_ exec.Executor = &ShowDDLJobsExec{}
 	_ exec.Executor = &ShowDDLJobQueriesExec{}
-	_ exec.Executor = &sort_exec.SortExec{}
+	_ exec.Executor = &sortexec.SortExec{}
 	_ exec.Executor = &aggregate.StreamAggExec{}
 	_ exec.Executor = &TableDualExec{}
 	_ exec.Executor = &TableReaderExecutor{}
 	_ exec.Executor = &TableScanExec{}
-	_ exec.Executor = &sort_exec.TopNExec{}
+	_ exec.Executor = &sortexec.TopNExec{}
 	_ exec.Executor = &UnionExec{}
 	_ exec.Executor = &FastCheckTableExec{}
 
diff --git a/pkg/executor/executor_pkg_test.go b/pkg/executor/executor_pkg_test.go
index 162f26f3df515..896f38a4211a7 100644
--- a/pkg/executor/executor_pkg_test.go
+++ b/pkg/executor/executor_pkg_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/tidb/pkg/executor/aggfuncs"
 	"github.com/pingcap/tidb/pkg/executor/aggregate"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
-	"github.com/pingcap/tidb/pkg/executor/sort_exec"
+	"github.com/pingcap/tidb/pkg/executor/sortexec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/kv"
 	plannerutil "github.com/pingcap/tidb/pkg/planner/util"
@@ -291,7 +291,7 @@ func TestSortSpillDisk(t *testing.T) {
 		ndvs:   cas.ndvs,
 	}
 	dataSource := buildMockDataSource(opt)
-	exe := &sort_exec.SortExec{
+	exe := &sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(cas.ctx, dataSource.Schema(), 0, dataSource),
 		ByItems:      make([]*plannerutil.ByItems, 0, len(cas.orderByIdx)),
 		ExecSchema:   dataSource.Schema(),
@@ -386,7 +386,7 @@ func TestSortSpillDisk(t *testing.T) {
 		ndvs:   cas.ndvs,
 	}
 	dataSource = buildMockDataSource(opt)
-	exe = &sort_exec.SortExec{
+	exe = &sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(cas.ctx, dataSource.Schema(), 0, dataSource),
 		ByItems:      make([]*plannerutil.ByItems, 0, len(cas.orderByIdx)),
 		ExecSchema:   dataSource.Schema(),
diff --git a/pkg/executor/executor_required_rows_test.go b/pkg/executor/executor_required_rows_test.go
index 034f47ae40fef..1aef3d44b7b67 100644
--- a/pkg/executor/executor_required_rows_test.go
+++ b/pkg/executor/executor_required_rows_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
-	"github.com/pingcap/tidb/pkg/executor/sort_exec"
+	"github.com/pingcap/tidb/pkg/executor/sortexec"
 	"github.com/pingcap/tidb/pkg/expression"
 	"github.com/pingcap/tidb/pkg/expression/aggregation"
 	"github.com/pingcap/tidb/pkg/parser/ast"
@@ -279,7 +279,7 @@ func TestSortRequiredRows(t *testing.T) {
 }
 
 func buildSortExec(sctx sessionctx.Context, byItems []*util.ByItems, src exec.Executor) exec.Executor {
-	sortExec := sort_exec.SortExec{
+	sortExec := sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(sctx, src.Schema(), 0, src),
 		ByItems:      byItems,
 		ExecSchema:   src.Schema(),
@@ -386,12 +386,12 @@ func TestTopNRequiredRows(t *testing.T) {
 }
 
 func buildTopNExec(ctx sessionctx.Context, offset, count int, byItems []*util.ByItems, src exec.Executor) exec.Executor {
-	sortExec := sort_exec.SortExec{
+	sortExec := sortexec.SortExec{
 		BaseExecutor: exec.NewBaseExecutor(ctx, src.Schema(), 0, src),
 		ByItems:      byItems,
 		ExecSchema:   src.Schema(),
 	}
-	return &sort_exec.TopNExec{
+	return &sortexec.TopNExec{
 		SortExec: sortExec,
 		Limit:    &plannercore.PhysicalLimit{Count: uint64(count), Offset: uint64(offset)},
 	}
diff --git a/pkg/executor/sort_exec/BUILD.bazel b/pkg/executor/sortexec/BUILD.bazel
similarity index 68%
rename from pkg/executor/sort_exec/BUILD.bazel
rename to pkg/executor/sortexec/BUILD.bazel
index 1f9546905373e..81d3caed95b91 100644
--- a/pkg/executor/sort_exec/BUILD.bazel
+++ b/pkg/executor/sortexec/BUILD.bazel
@@ -1,9 +1,9 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "sort_exec",
+    name = "sortexec",
     srcs = ["sort.go"],
-    importpath = "github.com/pingcap/tidb/pkg/executor/sort_exec",
+    importpath = "github.com/pingcap/tidb/pkg/executor/sortexec",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/executor/internal/exec",
@@ -33,3 +33,16 @@ go_test(
         "@com_github_stretchr_testify//require",
     ],
 )
+
+go_test(
+    name = "sortexec_test",
+    srcs = ["sort_test.go"],
+    deps = [
+        "//pkg/config",
+        "//pkg/sessionctx/variable",
+        "//pkg/testkit",
+        "//pkg/util",
+        "@com_github_pingcap_failpoint//:failpoint",
+        "@com_github_stretchr_testify//require",
+    ],
+)
diff --git a/pkg/executor/sort_exec/sort.go b/pkg/executor/sortexec/sort.go
similarity index 99%
rename from pkg/executor/sort_exec/sort.go
rename to pkg/executor/sortexec/sort.go
index 63e3022b4ee57..44d9caca299b2 100644
--- a/pkg/executor/sort_exec/sort.go
+++ b/pkg/executor/sortexec/sort.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package sort_exec
+package sortexec
 
 import (
 	"container/heap"
diff --git a/pkg/executor/sort_exec/sort_test.go b/pkg/executor/sortexec/sort_test.go
similarity index 99%
rename from pkg/executor/sort_exec/sort_test.go
rename to pkg/executor/sortexec/sort_test.go
index 5f52e5b9183c2..29742415e1b75 100644
--- a/pkg/executor/sort_exec/sort_test.go
+++ b/pkg/executor/sortexec/sort_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package sort_exec_test
+package sortexec_test
 
 import (
 	"bytes"