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 d5eb5fd..8191c49 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
@@ -2680,6 +2680,9 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
 
 		}).when(mockRegion).invalidate(any());
 
+		// Map.isEmpty() / Region.isEmpty()
+		doAnswer(invocation -> data.isEmpty()).when(mockRegion).isEmpty();
+
 		// Region.put(key, value)
 		when(mockRegion.put(any(), 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 b462ce1..f17373c 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
@@ -621,4 +621,21 @@ public class MockRegionDataAccessOperationsAndEventsUnitTests {
 		assertThat(this.mockRegion.getOrDefault(1, "MOCK")).isEqualTo("TEST");
 		assertThat(this.mockRegion.getOrDefault(2, "MOCK")).isEqualTo("MOCK");
 	}
+
+	@Test
+	public void mapRegionIsEmptyIsCorrect() {
+
+		assertThat(this.mockRegion).hasSize(0);
+		assertThat(this.mockRegion).isEmpty();
+
+		this.mockRegion.put(1, "TEST");
+
+		assertThat(this.mockRegion).hasSize(1);
+		assertThat(this.mockRegion).isNotEmpty();
+
+		this.mockRegion.remove(1);
+
+		assertThat(this.mockRegion).hasSize(0);
+		assertThat(this.mockRegion).isEmpty();
+	}
 }