diff --git a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
index d3f60354..214ae037 100644
--- a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
+++ b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java
@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.springframework.data.gemfire.util.DistributedSystemUtils;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
@@ -28,7 +29,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * GemfireUtils is an abstract utility class encapsulating common functionality to access features and capabilities
diff --git a/src/main/java/org/springframework/data/gemfire/ScopeType.java b/src/main/java/org/springframework/data/gemfire/ScopeType.java
index df35e636..e618ae57 100644
--- a/src/main/java/org/springframework/data/gemfire/ScopeType.java
+++ b/src/main/java/org/springframework/data/gemfire/ScopeType.java
@@ -16,8 +16,9 @@
 
 package org.springframework.data.gemfire;
 
+import org.springframework.util.StringUtils;
+
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The ScopeType enum is an enumeration of GemFire Scopes.
diff --git a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
index baf18c42..44c406a0 100644
--- a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
+++ b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java
@@ -22,9 +22,9 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
 import org.springframework.beans.factory.wiring.BeanWiringInfo;
 import org.springframework.beans.factory.wiring.BeanWiringInfoResolver;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * Dedicated {@link Declarable} support class for wiring the declaring instance through the Spring container.
diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java
index cee3bae7..7bfd8e85 100644
--- a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java
+++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java
@@ -19,9 +19,9 @@ package org.springframework.data.gemfire.snapshot.event;
 import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata;
 
 import org.springframework.context.ApplicationEvent;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The SnapshotApplicationEvent class is a Spring ApplicationEvent signaling a GemFire Cache or Region snapshot event,
diff --git a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java
index 140a12d9..2f6609fd 100644
--- a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java
+++ b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java
@@ -19,6 +19,7 @@ package org.springframework.data.gemfire.util;
 import java.util.Properties;
 
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.GemFireCache;
 import com.gemstone.gemfire.cache.server.CacheServer;
@@ -26,7 +27,6 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.DistributionLocator;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * DistributedSystemUtils is an abstract utility class for working with the GemFire DistributedSystem.
diff --git a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java
index bb1d3b16..edfab517 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java
@@ -25,9 +25,9 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * Base class for GemFire WAN Gateway component factory beans.
diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
index 111faae4..3af695ab 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
@@ -21,13 +21,13 @@ import java.util.List;
 
 import org.springframework.data.gemfire.wan.GatewayProxy.GatewayQueue;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.util.Gateway;
 import com.gemstone.gemfire.cache.util.GatewayEventListener;
 import com.gemstone.gemfire.cache.util.GatewayHub;
 import com.gemstone.gemfire.cache.util.GatewayQueueAttributes;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * FactoryBean for creating a GemFire {@link GatewayHub} (deprecated in Gemfire 7).
diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
index 5023e774..3aa78f40 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
@@ -21,12 +21,12 @@ import java.util.List;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
 import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * Spring FactoryBean for creating a GemFire {@link GatewayReceiver}.
diff --git a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java
index d9a5dee1..6c0d4281 100644
--- a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java
@@ -30,10 +30,10 @@ import org.springframework.data.gemfire.function.sample.HelloFunctionExecution;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The LazyWiringDeclarableSupportFunctionBasedIntegrationTest class is a test suite of test cases testing the contract
diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
index 66be8464..68e8bc23 100644
--- a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
@@ -31,6 +31,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.CacheListener;
 import com.gemstone.gemfire.cache.CacheLoader;
@@ -51,7 +52,6 @@ import com.gemstone.gemfire.cache.RegionEvent;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The LookupRegionMutationIntegrationTest class is a test suite of test cases testing the contract and integrated
@@ -140,7 +140,7 @@ public class LookupRegionMutationIntegrationTest {
 		assertEquals("AEQ", example.getAttributes().getAsyncEventQueueIds().iterator().next());
 	}
 
-	protected static interface Nameable extends BeanNameAware {
+	protected interface Nameable extends BeanNameAware {
 		String getName();
 		void setName(String name);
 	}
diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java
index 5f2d579b..ab41632b 100644
--- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java
@@ -46,6 +46,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.gemfire.TestUtils;
 import org.springframework.data.gemfire.config.GemfireConstants;
 import org.springframework.data.gemfire.util.DistributedSystemUtils;
+import org.springframework.util.ObjectUtils;
 
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.GemFireCache;
@@ -53,7 +54,6 @@ import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.internal.lang.ClassUtils;
 import com.gemstone.gemfire.pdx.PdxSerializer;
 
 /**
@@ -456,7 +456,7 @@ public class ClientCacheFactoryBeanTest {
 			assertTrue(expected.getMessage(), expected.getMessage().startsWith(String.format(
 				"no bean of type '%1$s' having name '%2$s' was found; a ClientCache requires a Pool",
 				Pool.class.getName(), GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)));
-			assertTrue(String.format("Cause was: %1$s!", ClassUtils.getClassName(expected.getCause())),
+			assertTrue(String.format("Cause was: %1$s!", ObjectUtils.nullSafeClassName(expected.getCause())),
 				expected.getCause() instanceof IllegalArgumentException);
 			assertEquals("TEST", expected.getCause().getMessage());
 			throw expected;
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
index 40f6e2b8..755daa49 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java
@@ -19,9 +19,9 @@ import java.io.Serializable;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.util.ObjectUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.gemstone.gemfire.management.internal.cli.util.spring.ObjectUtils;
 
 /**
  * The Person class models a person.
diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java
index 7e9f747c..09203fcb 100644
--- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java
@@ -44,10 +44,10 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.snapshot.SnapshotFilter;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The SnapshotApplicationEventTriggeredImportsExportsIntegrationTest class is a test suite of test cases testing
diff --git a/src/test/java/org/springframework/data/gemfire/test/AbstractMockerySupport.java b/src/test/java/org/springframework/data/gemfire/test/AbstractMockerySupport.java
index 9c8eb9c2..887a6366 100644
--- a/src/test/java/org/springframework/data/gemfire/test/AbstractMockerySupport.java
+++ b/src/test/java/org/springframework/data/gemfire/test/AbstractMockerySupport.java
@@ -18,8 +18,7 @@ package org.springframework.data.gemfire.test;
 
 import org.springframework.data.gemfire.test.support.IdentifierSequence;
 import org.springframework.data.gemfire.test.support.StackTraceUtils;
-
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * The AbstractMockery class is an abstract base class supporting the creation and use of mock objects in unit tests.
diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java
index 86eb1a7b..db9cf26f 100644
--- a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java
+++ b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.data.gemfire.config.GemfireConstants;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.CacheListener;
 import com.gemstone.gemfire.cache.CustomExpiry;
@@ -38,7 +39,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientRegionFactory;
 import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 import com.gemstone.gemfire.compression.Compressor;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The MockClientRegionFactory class...
diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
index a9f2cae3..341ceb38 100644
--- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
+++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
@@ -24,11 +24,11 @@ import java.util.Random;
 
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
 import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * @author David Turanski
diff --git a/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java b/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java
index de1c970f..91b74fff 100644
--- a/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java
+++ b/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java
@@ -24,8 +24,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 import org.springframework.util.Assert;
-
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * The FileUtils class is a utility class for processing files, working with java.io.File objects.