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 e189461..fb9531b 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
@@ -2339,8 +2339,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
 		}).when(mockRegion).clear();
 
 		// Map.containsKey(key) / Region.containsKey(key)
-		when(mockRegion.containsKey(any())).thenAnswer(invocation ->
-			data.containsKey(invocation.getArgument(0)));
+		doAnswer(invocation -> data.containsKey(invocation.getArgument(0))).when(mockRegion).containsKey(any());
 
 		// Region.get(key)
 		when(mockRegion.get(ArgumentMatchers.<K>any())).thenAnswer(invocation -> {
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
index 44b4762..6ba673e 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
@@ -503,4 +503,16 @@ public class MockRegionDataAccessOperationsAndEventsUnitTests {
 
 		assertThat(this.mockRegion).hasSize(0);
 	}
+
+	@Test
+	public void mapRegionContainsKeyIsCorrect() {
+
+		assertThat(this.mockRegion).hasSize(0);
+
+		this.mockRegion.put(1, "TEST");
+
+		assertThat(this.mockRegion).hasSize(1);
+		assertThat(this.mockRegion.containsKey(1)).isTrue();
+		assertThat(this.mockRegion.containsKey(1.0d)).isFalse();
+	}
 }