diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTest.java
similarity index 95%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTest.java
index 87725a60a26ca9..a723c6b0fd0226 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/LateralSnapshotJoinBatchSemanticTest.java
@@ -29,7 +29,7 @@
  * BatchPhysicalLateralSnapshotJoinRule} degrades the join to a regular join of the probe side
  * against the (final) build side.
  */
-public class LateralSnapshotJoinBatchSemanticTests extends BatchSemanticTestBase {
+public class LateralSnapshotJoinBatchSemanticTest extends BatchSemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTest.java
similarity index 95%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTest.java
index cbb21de8898f70..a8786f4e987a12 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/batch/MLPredictBatchSemanticTest.java
@@ -28,7 +28,7 @@
 import static org.apache.flink.table.planner.plan.nodes.exec.stream.MLPredictTestPrograms.SYNC_ML_PREDICT_TABLE_API;
 
 /** Semantic tests for {@link BatchExecMLPredictTableFunction} using Table API. */
-public class MLPredictBatchSemanticTests extends BatchSemanticTestBase {
+public class MLPredictBatchSemanticTest extends BatchSemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTest.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTest.java
index eb856e56e50be4..6a2e84c12c1165 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ChangelogNormalizeSemanticTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link StreamExecChangelogNormalize}. */
-public class ChangelogNormalizeSemanticTests extends SemanticTestBase {
+public class ChangelogNormalizeSemanticTest extends SemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTest.java
similarity index 97%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTest.java
index 5f08ddea816ac0..8a38af947a3ef5 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ConstraintEnforcerSemanticTest.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link ConstraintEnforcer}. */
-public class ConstraintEnforcerSemanticTests extends SemanticTestBase {
+public class ConstraintEnforcerSemanticTest extends SemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTest.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTest.java
index eba93c8bba9cea..42491c7743020b 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/DeletesByKeySemanticTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /** Semantic tests for various {@link StreamExecNode}s and sources producing deletes by key only. */
-public class DeletesByKeySemanticTests extends SemanticTestBase {
+public class DeletesByKeySemanticTest extends SemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTest.java
similarity index 97%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTest.java
index 2892d22eda95ea..84026fd29643df 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/FromChangelogSemanticTest.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /** Semantic tests for the built-in FROM_CHANGELOG process table function. */
-public class FromChangelogSemanticTests extends SemanticTestBase {
+public class FromChangelogSemanticTest extends SemanticTestBase {
 
     @Override
     protected void applyDefaultEnvironmentOptions(TableConfig config) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTest.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTest.java
index 4988c34a93cf47..dda41689e01817 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/JoinSemanticTest.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link StreamExecJoin}. */
-public class JoinSemanticTests extends SemanticTestBase {
+public class JoinSemanticTest extends SemanticTestBase {
     @Override
     public List<TableTestProgram> programs() {
         return List.of(
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTest.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTest.java
index 6536f34a591492..a58da0408127c1 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/LateralSnapshotJoinSemanticTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link StreamExecLateralSnapshotJoin}. */
-public class LateralSnapshotJoinSemanticTests extends SemanticTestBase {
+public class LateralSnapshotJoinSemanticTest extends SemanticTestBase {
     @Override
     public List<TableTestProgram> programs() {
         return List.of(
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTest.java
similarity index 96%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTest.java
index ba98302ccef3fd..44fac5335de022 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MiscSemanticTest.java
@@ -25,7 +25,7 @@
 import java.util.List;
 
 /** Semantic tests for various {@link StreamExecNode}s. */
-public class MiscSemanticTests extends SemanticTestBase {
+public class MiscSemanticTest extends SemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTest.java
similarity index 97%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTest.java
index 706e512a3de3e1..cfeca58e45bc11 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinSemanticTest.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link StreamExecMultiJoin}. */
-public class MultiJoinSemanticTests extends SemanticTestBase {
+public class MultiJoinSemanticTest extends SemanticTestBase {
 
     @Override
     protected void applyDefaultEnvironmentOptions(TableConfig config) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTest.java
similarity index 94%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTest.java
index 03ef42de0e142a..be688a11a62e14 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionRestoreTest.java
@@ -24,9 +24,9 @@
 import java.util.List;
 
 /** Restore tests for {@link StreamExecProcessTableFunction}. */
-public class ProcessTableFunctionRestoreTests extends RestoreTestBase {
+public class ProcessTableFunctionRestoreTest extends RestoreTestBase {
 
-    protected ProcessTableFunctionRestoreTests() {
+    protected ProcessTableFunctionRestoreTest() {
         super(StreamExecProcessTableFunction.class);
     }
 
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTest.java
similarity index 98%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTest.java
index 2357235b11864b..a8e273199edf8d 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ProcessTableFunctionSemanticTest.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /** Semantic tests for {@link StreamExecProcessTableFunction}. */
-public class ProcessTableFunctionSemanticTests extends SemanticTestBase {
+public class ProcessTableFunctionSemanticTest extends SemanticTestBase {
 
     @Override
     public List<TableTestProgram> programs() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTest.java
similarity index 98%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTest.java
index 9ee3f57a329136..2ad9aef9a46e82 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/SinkSemanticTest.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 
 /** Semantic tests for {@link StreamExecSink}. */
-public class SinkSemanticTests extends SemanticTestBase {
+public class SinkSemanticTest extends SemanticTestBase {
 
     @Override
     public EnumSet<TestKind> supportedSetupSteps() {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTests.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTest.java
similarity index 97%
rename from flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTests.java
rename to flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTest.java
index c35394c7694ee8..af644b838500fe 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTests.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/ToChangelogSemanticTest.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 /** Semantic tests for the built-in TO_CHANGELOG process table function. */
-public class ToChangelogSemanticTests extends SemanticTestBase {
+public class ToChangelogSemanticTest extends SemanticTestBase {
 
     @Override
     protected void applyDefaultEnvironmentOptions(TableConfig config) {
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/join/LateralSnapshotJoinITCase.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/join/LateralSnapshotJoinITCase.java
index 58632e44326543..29b9d5aeab445c 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/join/LateralSnapshotJoinITCase.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/stream/sql/join/LateralSnapshotJoinITCase.java
@@ -49,7 +49,7 @@
 /**
  * Result tests for the {@code LATERAL SNAPSHOT} processing-time temporal join that are
  * non-deterministic or benefit from dual-backend (HEAP/ROCKSDB) coverage. Deterministic,
- * backend-agnostic cases live in {@code LateralSnapshotJoinSemanticTests}; time-driven behavior
+ * backend-agnostic cases live in {@code LateralSnapshotJoinSemanticTest}; time-driven behavior
  * (idle-timeout flip, state-TTL eviction) in {@code LateralSnapshotJoinOperatorTest}.
  *
  * <p>To stabilize results, each build source appends a non-matching "flip-trigger" row at {@link