diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/DefaultSignatureStoreTest.java b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/DefaultSignatureStoreTest.java
index 4294f3409379ac4a768e161fc7255fe81a94dc7a..0fbed64ea7f109423a8751fa86415111af3094ae 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/DefaultSignatureStoreTest.java
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/DefaultSignatureStoreTest.java
@@ -86,7 +86,7 @@ public void setUp() throws Exception
         this.mocker.registerComponent(EntityReferenceValueProvider.class, "current", valueProvider);
 
         Provider<XWikiContext> xcontextProvider =
-            this.mocker.getInstance(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
+            this.mocker.registerMockComponent(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
         this.xcontext = mock(XWikiContext.class);
         when(xcontextProvider.get()).thenReturn(this.xcontext);
         this.xwiki = mock(com.xpn.xwiki.XWiki.class);
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509CertificateWikiStoreTest.java b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509CertificateWikiStoreTest.java
index e1202da38e444cd273095b044cb474ddd10a3f18..21dd481c8fbf69c56f16ccf8f1d405ef1c67e745 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509CertificateWikiStoreTest.java
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509CertificateWikiStoreTest.java
@@ -147,7 +147,7 @@ public void setUp() throws Exception
         mocker.registerComponent(EntityReferenceValueProvider.class, "current", valueProvider);
 
         Provider<XWikiContext> xcontextProvider =
-            mocker.getInstance(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
+            mocker.registerMockComponent(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
         xcontext = mock(XWikiContext.class);
         when(xcontextProvider.get()).thenReturn(xcontext);
         xwiki = mock(com.xpn.xwiki.XWiki.class);
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509KeyWikiStoreTest.java b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509KeyWikiStoreTest.java
index 4a2f384763cc149699eea39cd08b7aeb54a03d16..6ed7eaef274c9489e7627d7127ad6410d96a89c3 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509KeyWikiStoreTest.java
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/src/test/java/org/xwiki/crypto/store/wiki/internal/X509KeyWikiStoreTest.java
@@ -127,7 +127,7 @@ public void setUp() throws Exception
         mocker.registerComponent(EntityReferenceValueProvider.class, "current", valueProvider);
 
         Provider<XWikiContext> xcontextProvider =
-            mocker.getInstance(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
+            mocker.registerMockComponent(new DefaultParameterizedType(null, Provider.class, XWikiContext.class));
         xcontext = mock(XWikiContext.class);
         when(xcontextProvider.get()).thenReturn(xcontext);
         xwiki = mock(com.xpn.xwiki.XWiki.class);