diff --git a/src/main/java/org/springframework/data/gemfire/ScopeType.java b/src/main/java/org/springframework/data/gemfire/ScopeType.java
index 2e8f2c31..e618ae57 100644
--- a/src/main/java/org/springframework/data/gemfire/ScopeType.java
+++ b/src/main/java/org/springframework/data/gemfire/ScopeType.java
@@ -16,9 +16,10 @@
 
 package org.springframework.data.gemfire;
 
-import com.gemstone.gemfire.cache.Scope;
 import org.springframework.util.StringUtils;
 
+import com.gemstone.gemfire.cache.Scope;
+
 /**
  * The ScopeType enum is an enumeration of GemFire Scopes.
  *
diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
index 741c5aa4..3fafc869 100644
--- a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java
@@ -159,7 +159,7 @@ public class LookupRegionMutationIntegrationTest {
 		assertGatewaySenders(example, Arrays.asList("GWS"));
 	}
 
-	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/test/support/FileUtils.java b/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java
index d8220450..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
@@ -26,7 +26,6 @@ import java.io.IOException;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-
 /**
  * The FileUtils class is a utility class for processing files, working with java.io.File objects.
  *