diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java
index ec06c8d4..f40d8d17 100644
--- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java
@@ -16,11 +16,19 @@
 
 package org.springframework.data.gemfire;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.hamcrest.Matchers.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -55,14 +63,14 @@ import org.springframework.data.gemfire.test.support.AbstractUnitAndIntegrationT
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.GemfireTemplate
  * @see AbstractUnitAndIntegrationTestsWithMockSupport
  * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer
  * @see org.springframework.test.context.ContextConfiguration
  */
-@RunWith(MockitoJUnitRunner.class)
 @SuppressWarnings("unused")
+@RunWith(MockitoJUnitRunner.class)
 public class GemfireTemplateUnitTests extends AbstractUnitAndIntegrationTestsWithMockSupport {
 
 	@Rule
diff --git a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java
index 1760400a..d14d3210 100644
--- a/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java
+++ b/src/test/java/org/springframework/data/gemfire/cache/CallableCacheLoaderAdapterTest.java
@@ -47,7 +47,7 @@ import org.mockito.stubbing.Answer;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see java.util.concurrent.Callable
  * @see org.apache.geode.cache.CacheLoader
  * @see org.apache.geode.cache.LoaderHelper
diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java
index 2be5899b..2b347f17 100644
--- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheManagerUnitTests.java
@@ -44,7 +44,7 @@ import org.springframework.cache.Cache;
  * @author John Blum
  * @see org.junit.Test
  * @see org.mockito.Mock
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @since 1.9.0
  */
 @RunWith(MockitoJUnitRunner.class)
diff --git a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java
index 80b17446..b364afb9 100644
--- a/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/cache/GemfireCacheUnitTests.java
@@ -48,7 +48,7 @@ import org.springframework.cache.Cache;
  * @author John Blum
  * @see org.junit.Test
  * @see org.mockito.Mock
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see GemfireCache
  * @see org.apache.geode.cache.Region
  * @since 1.9.0
diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java
index a55339e9..2394184b 100644
--- a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java
@@ -47,7 +47,7 @@ import org.springframework.data.gemfire.GemfireUtils;
  * @see org.junit.rules.ExpectedException
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.client.support.DefaultableDelegatingPoolAdapter
  * @since 1.8.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java
index 19e48fc9..4a4f9221 100644
--- a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java
@@ -55,7 +55,7 @@ import org.springframework.data.gemfire.GemfireUtils;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see DelegatingPoolAdapter
  * @see org.apache.geode.cache.client.Pool
  * @see org.apache.geode.cache.client.PoolFactory
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java
index c3841c29..1b9308fb 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java
@@ -55,7 +55,7 @@ import org.springframework.util.MethodInvoker;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration
  * @since 1.9.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java
index 3a096ab1..2a5e90a0 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexingConfigurationUnitTests.java
@@ -211,8 +211,8 @@ public class EnableIndexingConfigurationUnitTests {
 			doAnswer(invocation -> {
 				LuceneIndex mockLuceneIndex = mock(LuceneIndex.class);
 
-				String indexName = invocation.getArgumentAt(0, String.class);
-				String regionPath = invocation.getArgumentAt(1, String.class);
+				String indexName = invocation.getArgument(0);
+				String regionPath = invocation.getArgument(1);
 
 				when(mockLuceneIndex.getName()).thenReturn(indexName);
 				when(mockLuceneIndex.getRegionPath()).thenReturn(regionPath);
diff --git a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java
index 9270c18b..86f69833 100644
--- a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java
@@ -56,7 +56,7 @@ import org.springframework.data.gemfire.util.CollectionUtils;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.config.support.AutoRegionLookupBeanPostProcessor
  * @since 1.9.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java
index f7154000..b0361b13 100644
--- a/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessorUnitTests.java
@@ -42,7 +42,7 @@ import org.springframework.data.gemfire.util.ArrayUtils;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see ClientRegionPoolBeanFactoryPostProcessor
  * @since 1.8.2
  */
diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java
index d0a34f6d..eed0d78b 100644
--- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java
@@ -48,7 +48,7 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants;
  * @author John Blum
  * @see org.junit.Test
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see DefinedIndexesApplicationListener
  * @since 1.7.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java
index 32015526..b0a31eb5 100644
--- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheParserUnitTests.java
@@ -45,7 +45,7 @@ import org.w3c.dom.NodeList;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.config.xml.ClientCacheParser
  * @since 1.8.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java
index 6e5a9916..df7637f3 100644
--- a/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/xml/LuceneNamespaceUnitTests.java
@@ -20,7 +20,6 @@ package org.springframework.data.gemfire.config.xml;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.anyVararg;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.doAnswer;
@@ -177,7 +176,7 @@ public class LuceneNamespaceUnitTests {
 				Answer<LuceneIndex> mockLuceneIndex = newMockLuceneIndex(this.luceneService);
 
 				doAnswer(mockLuceneIndex).when(this.luceneService)
-					.createIndex(anyString(), anyString(), (String[]) anyVararg());
+					.createIndex(anyString(), anyString(), (String[]) any());
 
 				doAnswer(mockLuceneIndex).when(this.luceneService)
 					.createIndex(anyString(), anyString(), isA(Map.class));
@@ -189,8 +188,8 @@ public class LuceneNamespaceUnitTests {
 		@SuppressWarnings("unchecked")
 		private Answer<LuceneIndex> newMockLuceneIndex(LuceneService mockLuceneService) {
 			return (invocationOnMock) -> {
-				String indexName = invocationOnMock.getArgumentAt(0, String.class);
-				String regionPath = invocationOnMock.getArgumentAt(1, String.class);
+				String indexName = invocationOnMock.getArgument(0);
+				String regionPath = invocationOnMock.getArgument(1);
 
 				LuceneIndex mockLuceneIndex = mock(LuceneIndex.class, indexName);
 
@@ -198,7 +197,7 @@ public class LuceneNamespaceUnitTests {
 				when(mockLuceneIndex.getRegionPath()).thenReturn(regionPath);
 
 				if (invocationOnMock.getArguments().length > 2) {
-					Object fields = invocationOnMock.getArgumentAt(2, Object.class);
+					Object fields = invocationOnMock.getArgument(2);
 
 					if (fields instanceof Map) {
 						when(mockLuceneIndex.getFieldAnalyzers()).thenReturn((Map<String, Analyzer>) fields);
diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java
index 61aad3f3..853d383f 100644
--- a/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/xml/PoolParserUnitTests.java
@@ -59,7 +59,7 @@ import org.w3c.dom.NodeList;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.config.xml.PoolParser
  * @since 1.7.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java
index e7a270e3..36132724 100644
--- a/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/dao/GemfireDaoSupportUnitTests.java
@@ -39,7 +39,7 @@ import org.springframework.data.gemfire.GemfireTemplate;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  */
 @RunWith(MockitoJUnitRunner.class)
 public class GemfireDaoSupportUnitTests {
diff --git a/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java b/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java
index bb10c717..f7d39cc8 100644
--- a/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java
+++ b/src/test/java/org/springframework/data/gemfire/domain/support/AbstractSliceSupportTests.java
@@ -30,7 +30,7 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.domain.Pageable;
 
 /**
@@ -41,7 +41,7 @@ import org.springframework.data.domain.Pageable;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @since 1.0.0
  */
 @RunWith(MockitoJUnitRunner.class)
diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java
index e9bd99ad..24f2450a 100644
--- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java
+++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java
@@ -52,7 +52,7 @@ import org.mockito.junit.MockitoJUnitRunner;
  * @see org.junit.Test
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution
  * @see org.apache.geode.cache.execute.Execution
  * @since 1.7.0
diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
index 797c93a4..d9faf76e 100644
--- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
@@ -61,7 +61,7 @@ import org.springframework.data.mapping.model.ParameterValueProvider;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.core.convert.ConversionService
  * @see org.springframework.data.gemfire.mapping.MappingPdxSerializer
  * @see org.apache.geode.pdx.PdxReader
diff --git a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java
index 5b95c93b..78f88de0 100644
--- a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java
+++ b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java
@@ -49,7 +49,7 @@ import org.springframework.data.mapping.context.MappingContext;
  * @see org.junit.Test
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.mapping.Regions
  * @since 1.3.4
  */
diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
index 8f259dc2..fb9d169b 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java
@@ -74,7 +74,7 @@ import org.springframework.data.gemfire.repository.support.SimpleGemfireReposito
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryBean
  * @since 1.0.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
index c857a791..5350b3b1 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneAccessorUnitTests.java
@@ -46,7 +46,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupport;
 
@@ -60,7 +60,7 @@ import org.springframework.data.gemfire.search.lucene.support.LuceneAccessorSupp
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.LuceneAccessor
  * @since 1.0.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java
index f31de4a3..294b2f80 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneIndexFactoryBeanUnitTests.java
@@ -48,7 +48,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
@@ -62,7 +62,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.LuceneIndexFactoryBean
  * @since 1.1.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java
index 2c042905..e4ab4147 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneOperationsUnitTests.java
@@ -29,7 +29,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for the {@link LuceneOperations} interface.
@@ -39,7 +39,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.LuceneOperations
  * @since 1.0.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java
index 60e9eca5..6e943674 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneServiceFactoryBeanUnitTests.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link LuceneServiceFactoryBean}.
@@ -46,7 +46,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.LuceneServiceFactoryBean
  * @since 1.1.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
index 9af531f5..b29df7ed 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/LuceneTemplateUnitTests.java
@@ -46,7 +46,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link LuceneTemplate}.
@@ -57,7 +57,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.LuceneTemplate
  * @see org.apache.geode.cache.lucene.LuceneQuery
  * @see org.apache.geode.cache.lucene.LuceneQueryFactory
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java
index da5b2859..98054cd9 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneAccessorUnitTests.java
@@ -32,7 +32,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.gemfire.search.lucene.support.ProjectingLuceneAccessorSupport;
 import org.springframework.data.projection.ProjectionFactory;
@@ -47,7 +47,7 @@ import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor
  * @since 1.1.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java
index fcf2d254..c7bfcf21 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneOperationsUnitTests.java
@@ -28,7 +28,7 @@ import org.apache.geode.cache.lucene.LuceneQueryProvider;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link ProjectingLuceneOperations}.
@@ -38,7 +38,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneOperations
  * @since 1.1.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java
index 0bd3b08f..495f542d 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/ProjectingLuceneTemplateUnitTests.java
@@ -38,7 +38,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.mapping.annotation.Region;
 import org.springframework.data.projection.ProjectionFactory;
@@ -56,7 +56,7 @@ import lombok.RequiredArgsConstructor;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @since 1.1.0
  */
 @RunWith(MockitoJUnitRunner.class)
@@ -110,8 +110,7 @@ public class ProjectingLuceneTemplateUnitTests {
 
 		when(mockProjectionFactory.createProjection(eq(Book.class), anyString())).thenAnswer( invocationOnMock ->
 			books.stream().filter(book ->
-				book.getTitle().equals(invocationOnMock.getArgumentAt(1, String.class)))
-					.findFirst().orElse(null)
+				book.getTitle().equals(invocationOnMock.getArgument(1))).findFirst().orElse(null)
 		);
 
 		assertThat(luceneTemplate.query("title : Star Wars Episode *V*", "title", Book.class))
@@ -146,8 +145,7 @@ public class ProjectingLuceneTemplateUnitTests {
 
 		when(mockProjectionFactory.createProjection(eq(Book.class), anyString())).thenAnswer( invocationOnMock ->
 			books.stream().filter(book ->
-				book.getTitle().equals(invocationOnMock.getArgumentAt(1, String.class)))
-					.findFirst().orElse(null)
+				book.getTitle().equals(invocationOnMock.getArgument(1))).findFirst().orElse(null)
 		);
 
 		assertThat(luceneTemplate.query(mockQueryProvider, Book.class)).containsAll(books);
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java
index 7b15b666..5aa53798 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/LucenePageUnitTests.java
@@ -41,7 +41,7 @@ import org.apache.geode.cache.lucene.PageableLuceneQueryResults;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.domain.Page;
 import org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor;
 
@@ -57,7 +57,7 @@ import lombok.RequiredArgsConstructor;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.ProjectingLuceneAccessor
  * @see org.springframework.data.gemfire.search.lucene.support.LucenePage
  * @see org.apache.geode.cache.lucene.LuceneResultStruct
@@ -149,8 +149,8 @@ public class LucenePageUnitTests {
 	@SuppressWarnings("unchecked")
 	protected ProjectingLuceneAccessor prepare(ProjectingLuceneAccessor mockTemplate) {
 		when(mockTemplate.project(isA(List.class), eq(Person.class))).thenAnswer(invocation -> {
-			List<LuceneResultStruct<Long, String>> results = invocation.getArgumentAt(0, List.class);
-			assertThat(invocation.getArgumentAt(1, Class.class)).isEqualTo(Person.class);
+			List<LuceneResultStruct<Long, String>> results = invocation.getArgument(0);
+			assertThat(invocation.<Class>getArgument(1)).isEqualTo(Person.class);
 			return results.stream().map(result -> Person.parse(result.getValue())).collect(Collectors.toList());
 		});
 
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java
index d057690f..40a45f5e 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorFactoryUnitTests.java
@@ -24,7 +24,7 @@ import org.apache.geode.pdx.PdxInstance;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link PdxInstanceMethodInterceptorFactory}.
@@ -34,7 +34,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.aopalliance.intercept.MethodInterceptor
  * @see org.apache.geode.pdx.PdxInstance
  * @see org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptorFactory
diff --git a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java
index aea9fc7b..2475c08c 100644
--- a/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/search/lucene/support/PdxInstanceMethodInterceptorUnitTests.java
@@ -36,7 +36,7 @@ import org.apache.geode.pdx.WritablePdxInstance;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import lombok.Data;
 import lombok.NonNull;
@@ -50,7 +50,7 @@ import lombok.RequiredArgsConstructor;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.search.lucene.support.PdxInstanceMethodInterceptor
  * @since 1.1.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java
index 209b8c20..1ed7c080 100644
--- a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java
+++ b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java
@@ -45,7 +45,7 @@ import org.springframework.data.gemfire.test.support.FileSystemUtils;
  * @see org.junit.runner.RunWith
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent
  * @since 1.7.0
  */
diff --git a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java
index 9b499001..a8ec65e5 100644
--- a/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/support/DeclarableSupportUnitTests.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.BeanFactory;
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
  * @see org.mockito.Spy
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @since 2.0.0
  */
 @RunWith(MockitoJUnitRunner.class)
diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java
index 4fce7793..39ddffb0 100644
--- a/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/support/GemfireBeanFactoryLocatorUnitTests.java
@@ -53,7 +53,7 @@ import org.springframework.beans.factory.BeanFactory;
  * @see org.junit.Test
  * @see org.mockito.Mock
  * @see org.mockito.Mockito
- * @see org.mockito.runners.MockitoJUnitRunner
+ * @see org.mockito.junit.MockitoJUnitRunner
  * @see org.springframework.data.gemfire.support.GemfireBeanFactoryLocator
  * @since 2.0.0
  */