diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java
index 5de698db..31fd3f65 100644
--- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java
+++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationConfiguration.java
@@ -440,12 +440,13 @@ public class ClusterConfigurationConfiguration extends AbstractAnnotationConfigS
 			this.gemfireCache = gemfireCache;
 		}
 
-		public GemfireAdminOperations getGemfireAdminOperations() {
+		@SuppressWarnings("unchecked")
+		public <T extends GemfireAdminOperations> T getGemfireAdminOperations() {
 
 			Assert.state(this.gemfireAdminOperations != null,
 				"GemfireAdminOperations was not initialized");
 
-			return this.gemfireAdminOperations;
+			return (T) this.gemfireAdminOperations;
 		}
 
 		public boolean isClientCache() {
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java
index ef34c641..e36ef0d2 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTests.java
@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.annotation.Order;
+import org.springframework.data.gemfire.config.admin.GemfireAdminOperations;
 import org.springframework.data.gemfire.config.admin.remote.RestHttpGemfireAdminTemplate;
 import org.springframework.data.gemfire.test.mock.annotation.EnableGemFireMockObjects;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -132,10 +133,10 @@ public class ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTes
 
 		assertThat(schemaObjectContext).isNotNull();
 		assertThat(schemaObjectContext.<ClientCache>getGemfireCache()).isSameAs(this.clientCache);
-		assertThat(schemaObjectContext.getGemfireAdminOperations()).isInstanceOf(RestHttpGemfireAdminTemplate.class);
+		assertThat(schemaObjectContext.<GemfireAdminOperations>getGemfireAdminOperations())
+			.isInstanceOf(RestHttpGemfireAdminTemplate.class);
 
-		RestHttpGemfireAdminTemplate template =
-			(RestHttpGemfireAdminTemplate) schemaObjectContext.getGemfireAdminOperations();
+		RestHttpGemfireAdminTemplate template = schemaObjectContext.getGemfireAdminOperations();
 
 		RestTemplate restTemplate = resolveFieldValue(template, "restTemplate");
 
@@ -184,5 +185,4 @@ public class ClusterConfigurationWithClientHttpRequestInterceptorsIntegrationTes
 			return mock(ClientHttpRequestInterceptor.class);
 		}
 	}
-
 }
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java
index ce587e1f..fc93456d 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTests.java
@@ -84,7 +84,8 @@ public class ClusterConfigurationWithCustomGemfireAdminOperationsIntegrationTest
 		SchemaObjectContext schemaObjectContext = this.initializer.getSchemaObjectContext();
 
 		assertThat(schemaObjectContext).isNotNull();
-		assertThat(schemaObjectContext.getGemfireAdminOperations()).isSameAs(this.gemfireAdminOperations);
+		assertThat(schemaObjectContext.<GemfireAdminOperations>getGemfireAdminOperations())
+			.isSameAs(this.gemfireAdminOperations);
 	}
 
 	@ClientCacheApplication
diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java
index bfd3ac4f..4f1478c4 100644
--- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java
+++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableClusterConfigurationUnitTests.java
@@ -353,7 +353,7 @@ public class EnableClusterConfigurationUnitTests {
 		SchemaObjectContext schemaObjectContext = initializer.getSchemaObjectContext();
 
 		assertThat(schemaObjectContext).isNotNull();
-		assertThat(schemaObjectContext.getGemfireAdminOperations()).isEqualTo(mockGemfireAdminOperations);
+		assertThat(schemaObjectContext.<GemfireAdminOperations>getGemfireAdminOperations()).isEqualTo(mockGemfireAdminOperations);
 		assertThat(schemaObjectContext.getSchemaObjectCollector()).isInstanceOf(ComposableSchemaObjectCollector.class);
 		assertThat(schemaObjectContext.getSchemaObjectDefiner()).isInstanceOf(ComposableSchemaObjectDefiner.class);