diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTests.java
similarity index 99%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java
rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTests.java
index 7c2710156c7..6d1f88b26fb 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTests.java
@@ -54,7 +54,7 @@
 import org.mockito.MockitoAnnotations;
 
 @RunWith(Parameterized.class)
-public class SessionClientTest {
+public class SessionClientTests {
   private final class TestExecutorFactory implements ExecutorFactory<ScheduledExecutorService> {
     @Override
     public ScheduledExecutorService get() {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTests.java
similarity index 98%
rename from google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java
rename to google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTests.java
index 24b4ebf0964..9d84c6e0a1f 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTests.java
@@ -35,7 +35,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class DdlClientTest {
+public class DdlClientTests {
 
   private final String instanceId = "test-instance";
   private final String databaseId = "test-database";