diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java
index 3df1ce558..c282161da 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -236,7 +237,7 @@ public void testExistsCache() throws CoreException {
 		when(nullStorageProvider.getStorage(any(IProgressMonitor.class))).thenReturn(null);
 
 		IStorageProviderAccessor accessor = mock(IStorageProviderAccessor.class);
-		when(accessor.getStorageProvider(any(IResource.class), any(DiffSide.class)))
+		when(accessor.getStorageProvider(nullable(IResource.class), any(DiffSide.class)))
 				.then(new Answer<IStorageProvider>() {
 					public IStorageProvider answer(InvocationOnMock invocation) throws Throwable {
 						return iFile1.equals(invocation.getArguments()[0]) ? fileStorageProvider
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java
index e93c213ef..0954c25cf 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java
@@ -13,6 +13,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -56,8 +57,9 @@ public void testCaching() {
 
 		// mock calculation
 		IImplicitDependencies delegate = mock(IImplicitDependencies.class);
-		when(delegate.of(any(URI.class), any(URIConverter.class))).then(new Answer<Set<URI>>() {
+		when(delegate.of(any(URI.class), nullable(URIConverter.class))).then(new Answer<Set<URI>>() {
 			public Set<URI> answer(InvocationOnMock invocation) throws Throwable {
+				System.out.println("hey!");
 				Object uriArgument = invocation.getArguments()[0];
 				if (uriArgument.equals(uri1)) {
 					return Sets.newHashSet(uri1dependencies);
@@ -75,8 +77,8 @@ public Set<URI> answer(InvocationOnMock invocation) throws Throwable {
 		assertEquals(uri2dependencies, cachingDependencies.of(uri2, null));
 
 		// delegate was only called once for each uri
-		verify(delegate, times(1)).of(eq(uri1), any(URIConverter.class));
-		verify(delegate, times(1)).of(eq(uri2), any(URIConverter.class));
+		verify(delegate, times(1)).of(eq(uri1), nullable(URIConverter.class));
+		verify(delegate, times(1)).of(eq(uri2), nullable(URIConverter.class));
 
 		// query dependencies multiple times
 		assertEquals(uri1dependencies, cachingDependencies.of(uri1, null));
@@ -89,7 +91,7 @@ public Set<URI> answer(InvocationOnMock invocation) throws Throwable {
 		assertEquals(uri2dependencies, cachingDependencies.of(uri2, null));
 
 		// delegate was only called once for each uri, cache used
-		verify(delegate, times(1)).of(eq(uri1), any(URIConverter.class));
-		verify(delegate, times(1)).of(eq(uri2), any(URIConverter.class));
+		verify(delegate, times(1)).of(eq(uri1), nullable(URIConverter.class));
+		verify(delegate, times(1)).of(eq(uri2), nullable(URIConverter.class));
 	}
 }