diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
index e100bc0..06a0744 100644
--- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
+++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
@@ -1165,7 +1165,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
 		doAnswer(newSetter(subscriptionDiskStoreName, () -> null))
 			.when(mockClientSubscriptionConfig).setDiskStoreName(anyString());
 
-		doAnswer(newSetter(subscriptionEvictionPolicy, stringToSubscriptionEvictionPolicyConverter, null))
+		doAnswer(newSetter(subscriptionEvictionPolicy, stringToSubscriptionEvictionPolicyConverter, () -> null))
 			.when(mockClientSubscriptionConfig).setEvictionPolicy(anyString());
 
 		when(mockClientSubscriptionConfig.getCapacity()).thenAnswer(newGetter(subscriptionCapacity));
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
index 68b83fb..71e73b7 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
@@ -13,7 +13,6 @@
  *  or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
-
 package org.springframework.data.gemfire.tests.mock;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -22,12 +21,14 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.junit.After;
+import org.junit.Test;
+
 import org.apache.geode.cache.AttributesMutator;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.RegionService;
-import org.junit.After;
-import org.junit.Test;
+import org.apache.geode.cache.server.ClientSubscriptionConfig;
 
 /**
  * Unit tests for {@link GemFireMockObjectsSupport}.
@@ -46,7 +47,7 @@ public class GemFireMockObjectsSupportUnitTests {
 	}
 
 	@Test
-	public void regionCloningEnableReturnsFalseByDefault() {
+	public void regionCloningEnabledReturnsFalseByDefault() {
 
 		RegionService mockRegionService = mock(RegionService.class);
 
@@ -108,4 +109,21 @@ public class GemFireMockObjectsSupportUnitTests {
 
 		verify(mockAttributesMutator, times(1)).setCloningEnabled(eq(true));
 	}
+
+	@Test
+	public void mockClientSubscriptionConfigIsCorrect() {
+
+		ClientSubscriptionConfig mockClientSubscriptionConfig =
+			GemFireMockObjectsSupport.mockClientSubscriptionConfig();
+
+		assertThat(mockClientSubscriptionConfig).isNotNull();
+
+		mockClientSubscriptionConfig.setCapacity(1024);
+		mockClientSubscriptionConfig.setDiskStoreName("TestDiskStore");
+		mockClientSubscriptionConfig.setEvictionPolicy("ENTRY");
+
+		assertThat(mockClientSubscriptionConfig.getCapacity()).isEqualTo(1024);
+		assertThat(mockClientSubscriptionConfig.getDiskStoreName()).isEqualTo("TestDiskStore");
+		assertThat(mockClientSubscriptionConfig.getEvictionPolicy()).isEqualTo("entry");
+	}
 }