diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
index 2a11f37..74a13c4 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/annotation/GemFireMockObjectsConfiguration.java
@@ -118,7 +118,8 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup
 
 		return new BeanPostProcessor() {
 
-			public Object postProcessAfterInitialization(@NonNull Object bean, String beanName) throws BeansException {
+			public Object postProcessAfterInitialization(@NonNull Object bean, @NonNull String beanName)
+					throws BeansException {
 
 				if (bean instanceof GemfireRepository) {
 
@@ -136,6 +137,7 @@ public class GemFireMockObjectsConfiguration extends AbstractAnnotationConfigSup
 				return bean;
 			}
 
+			@SuppressWarnings("unchecked")
 			private Optional<Region<?, ?>> getRegion(@Nullable Object bean) {
 
 				return Optional.ofNullable(bean)
diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/beans/factory/config/GemFireMockObjectsBeanPostProcessor.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/beans/factory/config/GemFireMockObjectsBeanPostProcessor.java
index 36f04b2..cef843c 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/beans/factory/config/GemFireMockObjectsBeanPostProcessor.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/beans/factory/config/GemFireMockObjectsBeanPostProcessor.java
@@ -77,7 +77,7 @@ public class GemFireMockObjectsBeanPostProcessor implements BeanPostProcessor {
 	}
 
 	@Nullable @Override
-	public Object postProcessBeforeInitialization(@NonNull Object bean, String beanName) throws BeansException {
+	public Object postProcessBeforeInitialization(@NonNull Object bean, @NonNull String beanName) throws BeansException {
 
 		return isGemFireProperties(bean, beanName) ? set((Properties) bean)
 			: bean instanceof CacheFactoryBean ? spyOnCacheFactoryBean((CacheFactoryBean) bean, isUsingSingletonCache())
@@ -86,7 +86,7 @@ public class GemFireMockObjectsBeanPostProcessor implements BeanPostProcessor {
 	}
 
 	@Nullable @Override
-	public Object postProcessAfterInitialization(@NonNull Object bean, String beanName) throws BeansException {
+	public Object postProcessAfterInitialization(@NonNull Object bean, @NonNull String beanName) throws BeansException {
 
 		if (bean instanceof GemFireCache) {