diff --git a/plugin/trino-hive/pom.xml b/plugin/trino-hive/pom.xml
index c0d8a2c40a7..3650d9bd934 100644
--- a/plugin/trino-hive/pom.xml
+++ b/plugin/trino-hive/pom.xml
@@ -411,8 +411,8 @@
                             <excludes>
                                 <exclude>**/TestHiveGlueMetastore.java</exclude>
                                 <exclude>**/TestFullParquetReader.java</exclude>
-                                <exclude>**/TestHiveFailureRecoveryFile.java</exclude>
-                                <exclude>**/TestHiveFailureRecoveryMinIO.java</exclude>
+                                <exclude>**/TestHiveFileFailureRecoveryTest.java</exclude>
+                                <exclude>**/TestHiveMinioFailureRecoveryTest.java</exclude>
                             </excludes>
                         </configuration>
                     </plugin>
@@ -463,8 +463,8 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <includes>
-                                <include>**/TestHiveFailureRecoveryFile.java</include>
-                                <include>**/TestHiveFailureRecoveryMinIO.java</include>
+                                <include>**/TestHiveFileFailureRecoveryTest.java</include>
+                                <include>**/TestHiveMinioFailureRecoveryTest.java</include>
                             </includes>
                         </configuration>
                     </plugin>
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveFailureRecovery.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
similarity index 97%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveFailureRecovery.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
index 67889c1b8f3..113645697b6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseTestHiveFailureRecovery.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
@@ -14,7 +14,7 @@
 package io.trino.plugin.hive;
 
 import io.trino.Session;
-import io.trino.testing.AbstractTestFailureRecovery;
+import io.trino.testing.BaseFailureRecoveryTest;
 import org.intellij.lang.annotations.Language;
 import org.testng.annotations.Test;
 
@@ -24,8 +24,8 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-public abstract class BaseTestHiveFailureRecovery
-        extends AbstractTestFailureRecovery
+public abstract class BaseHiveFailureRecoveryTest
+        extends BaseFailureRecoveryTest
 {
     @Override
     protected boolean areWriteRetriesSupported()
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryFile.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFailureRecoveryTest.java
similarity index 92%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryFile.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFailureRecoveryTest.java
index 345f8b99506..5459598e6a3 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryFile.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFileFailureRecoveryTest.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
-public class TestHiveFailureRecoveryFile
-        extends BaseTestHiveFailureRecovery
+public class TestHiveFileFailureRecoveryTest
+        extends BaseHiveFailureRecoveryTest
 {
     @Override
     protected QueryRunner createQueryRunner(List<TpchTable<?>> requiredTpchTables, Map<String, String> configProperties, Map<String, String> coordinatorProperties)
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryMinIO.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMinioFailureRecoveryTest.java
similarity index 95%
rename from plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryMinIO.java
rename to plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMinioFailureRecoveryTest.java
index 20d22f6264d..08c05f27bf6 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveFailureRecoveryMinIO.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveMinioFailureRecoveryTest.java
@@ -26,8 +26,8 @@
 
 import static io.trino.testing.sql.TestTable.randomTableSuffix;
 
-public class TestHiveFailureRecoveryMinIO
-        extends BaseTestHiveFailureRecovery
+public class TestHiveMinioFailureRecoveryTest
+        extends BaseHiveFailureRecoveryTest
 {
     private String bucketName;
     private HiveMinioDataLake dockerizedS3DataLake;
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestFailureRecovery.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
similarity index 99%
rename from testing/trino-testing/src/main/java/io/trino/testing/AbstractTestFailureRecovery.java
rename to testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
index 9b1d16c90fe..daee43dc4e0 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestFailureRecovery.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
@@ -75,7 +75,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.testng.Assert.assertEquals;
 
-public abstract class AbstractTestFailureRecovery
+public abstract class BaseFailureRecoveryTest
         extends AbstractTestQueryFramework
 {
     private static final String PARTITIONED_LINEITEM = "partitioned_lineitem";