diff --git a/build.gradle b/build.gradle
index fbbd351a7..c9dae6657 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,8 +59,8 @@ dependencies {
     testCompile "org.mockito:mockito-all:$mockitoVersion"
     testCompile("javax.annotation:jsr250-api:1.0", optional)
     testCompile("com.thoughtworks.xstream:xstream:1.3", optional)
-	testCompile "org.cassandraunit:cassandra-unit:1.2.0.1"
-	testCompile "cglib:cglib:2.2.2"
+	testCompile "org.cassandraunit:cassandra-unit:$cassandraUnitVersion"
+	testCompile "cglib:cglib-nodep:$cglibVersion"
 	
 }
 
diff --git a/gradle.properties b/gradle.properties
index e7a6e7cdd..2bfbeeea7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,8 @@
 
 # Logging
 log4jVersion = 1.2.17
+cassandraUnitVersion=1.2.0.1
+cglibVersion=2.2.2
 slf4jVersion = 1.6.6
 
 # Common libraries
diff --git a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java b/src/test/java/org/springframework/data/cassandra/config/TestConfig.java
index 9c15f604e..5c526ed60 100644
--- a/src/test/java/org/springframework/data/cassandra/config/TestConfig.java
+++ b/src/test/java/org/springframework/data/cassandra/config/TestConfig.java
@@ -1,12 +1,7 @@
 package org.springframework.data.cassandra.config;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.cassandra.core.CassandraKeyspaceFactoryBean;
-import org.springframework.data.cassandra.core.CassandraTemplate;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Cluster.Builder;