diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTests.java
similarity index 96%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTest.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTests.java
index f49abce22..68ba49296 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTest.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapterTests.java
@@ -55,9 +55,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 /**
  * @author Michael J. Simons
  */
-@ContextConfiguration(classes = { Neo4jOgmEntityInstantiatorAdapterTest.ContextConfig.class })
+@ContextConfiguration(classes = { Neo4jOgmEntityInstantiatorAdapterTests.ContextConfig.class })
 @RunWith(SpringRunner.class)
-public class Neo4jOgmEntityInstantiatorAdapterTest {
+public class Neo4jOgmEntityInstantiatorAdapterTests {
 
 	private static final Config driverConfig = Config.builder().withoutEncryption().build();
 
@@ -68,7 +68,7 @@ public class Neo4jOgmEntityInstantiatorAdapterTest {
 	public static void initializeNeo4j() {
 
 		serverControls = TestServerBuilders.newInProcessBuilder()
-				.withProcedure(Neo4jOgmEntityInstantiatorAdapterTest.ListReturningThing.class)
+				.withProcedure(Neo4jOgmEntityInstantiatorAdapterTests.ListReturningThing.class)
 				.withFixture("CREATE (m:MyNode{name: 'All the', things: []})").newServer();
 		boltURI = serverControls.boltURI();
 	}