diff --git a/pom.xml b/pom.xml
index 9504069bd9e..df2d6719ea4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -686,17 +686,17 @@
             </configuration>
           </execution>
           <execution>
-            <id>custom-context-key</id>
+            <id>custom-context-local</id>
             <goals>
               <goal>integration-test</goal>
               <goal>verify</goal>
             </goals>
             <configuration>
               <includes>
-                <include>io/vertx/it/CustomContextKeyTest.java</include>
+                <include>io/vertx/it/CustomContextLocalTest.java</include>
               </includes>
               <additionalClasspathElements>
-                <additionalClasspathElement>${project.basedir}/src/test/classpath/customcontextkey</additionalClasspathElement>
+                <additionalClasspathElement>${project.basedir}/src/test/classpath/customcontextlocal</additionalClasspathElement>
               </additionalClasspathElements>
             </configuration>
           </execution>
diff --git a/src/test/classpath/customcontextkey/META-INF/services/io.vertx.core.spi.VertxServiceProvider b/src/test/classpath/customcontextkey/META-INF/services/io.vertx.core.spi.VertxServiceProvider
deleted file mode 100644
index a8ad75cb13c..00000000000
--- a/src/test/classpath/customcontextkey/META-INF/services/io.vertx.core.spi.VertxServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-io.vertx.it.CustomContextKey
diff --git a/src/test/classpath/customcontextlocal/META-INF/services/io.vertx.core.spi.VertxServiceProvider b/src/test/classpath/customcontextlocal/META-INF/services/io.vertx.core.spi.VertxServiceProvider
new file mode 100644
index 00000000000..f9b60b3d0a8
--- /dev/null
+++ b/src/test/classpath/customcontextlocal/META-INF/services/io.vertx.core.spi.VertxServiceProvider
@@ -0,0 +1 @@
+io.vertx.it.CustomContextLocal
diff --git a/src/test/java/io/vertx/it/CustomContextKey.java b/src/test/java/io/vertx/it/CustomContextLocal.java
similarity index 64%
rename from src/test/java/io/vertx/it/CustomContextKey.java
rename to src/test/java/io/vertx/it/CustomContextLocal.java
index 26056d039d9..5f01ed44a31 100644
--- a/src/test/java/io/vertx/it/CustomContextKey.java
+++ b/src/test/java/io/vertx/it/CustomContextLocal.java
@@ -4,9 +4,9 @@
 import io.vertx.core.spi.VertxServiceProvider;
 import io.vertx.core.spi.context.storage.ContextLocal;
 
-public class CustomContextKey implements VertxServiceProvider  {
+public class CustomContextLocal implements VertxServiceProvider  {
 
-  public static ContextLocal<Object> CUSTOM_KEY = ContextLocal.registerLocal(Object.class);
+  public static ContextLocal<Object> CUSTOM_LOCAL = ContextLocal.registerLocal(Object.class);
   public static volatile boolean initialized;
 
   @Override
diff --git a/src/test/java/io/vertx/it/CustomContextLocalTest.java b/src/test/java/io/vertx/it/CustomContextLocalTest.java
index 1f12b576dbf..0cf49076f0c 100644
--- a/src/test/java/io/vertx/it/CustomContextLocalTest.java
+++ b/src/test/java/io/vertx/it/CustomContextLocalTest.java
@@ -8,10 +8,10 @@ public class CustomContextLocalTest extends VertxTestBase {
 
   @Test
   public void testResolver() {
-    assertTrue(CustomContextKey.initialized);
+    assertTrue(CustomContextLocal.initialized);
     Context context = vertx.getOrCreateContext();
     Object o = new Object();
-    context.putLocal(CustomContextKey.CUSTOM_KEY, o);
-    assertSame(o, context.getLocal(CustomContextKey.CUSTOM_KEY));
+    context.putLocal(CustomContextLocal.CUSTOM_LOCAL, o);
+    assertSame(o, context.getLocal(CustomContextLocal.CUSTOM_LOCAL));
   }
 }