diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexesConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexesConfigurationUnitTests.java
index 83cb0a7b..f96318c0 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexesConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableIndexesConfigurationUnitTests.java
@@ -23,6 +23,8 @@ import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Map;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.RegionFactory;
@@ -102,6 +104,16 @@ public class EnableIndexesConfigurationUnitTests {
 		assertIndex(lastNameIdx, "LastNameIdx", "lastName", "Customers", IndexType.HASH);
 	}
 
+	@Test
+	public void noIndexesCreatedForIndexedPersistentEntities() {
+		applicationContext = newApplicationContext(NoIndexesCreatedForIndexedPersistentEntityConfiguration.class);
+
+		Map<String, Index> indexes = applicationContext.getBeansOfType(Index.class);
+
+		assertThat(indexes).isNotNull();
+		assertThat(indexes.isEmpty()).isTrue();
+	}
+
 	@Configuration
 	@SuppressWarnings("unused")
 	static class CacheConfiguration {
@@ -186,4 +198,12 @@ public class EnableIndexesConfigurationUnitTests {
 	static class IndexedPersistentEntityConfiguration extends CacheConfiguration {
 
 	}
+
+	@EnableEntityDefinedRegions(basePackageClasses = NonEntity.class,
+		excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
+			ClientRegionEntity.class, CollocatedPartitionRegionEntity.class, GenericRegionEntity.class,
+			LocalRegionEntity.class, ReplicateRegionEntity.class }))
+	static class NoIndexesCreatedForIndexedPersistentEntityConfiguration extends CacheConfiguration {
+
+	}
 }