diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
index ffeb3a01e..be6704e30 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
@@ -8,7 +8,7 @@ import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cassandra.test.integration.support.BuildProperties;
+import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties;
 import org.springframework.cassandra.test.unit.support.Utils;
 
 import com.datastax.driver.core.Cluster;
@@ -26,7 +26,7 @@ public class AbstractEmbeddedCassandraIntegrationTest {
 	protected static String CASSANDRA_CONFIG = "spring-cassandra.yaml";
 	protected static String CASSANDRA_HOST = "localhost";
 
-	protected static BuildProperties PROPS = new BuildProperties();
+	protected static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties();
 	protected static int CASSANDRA_NATIVE_PORT = PROPS.getCassandraPort();
 
 	/**
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
index 3a3ca1f10..91ad3cc3a 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public abstract class AbstractTestJavaConfig extends AbstractSessionConfiguration {
 
-	public static BuildProperties PROPS = new BuildProperties();
+	public static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties();
 	public static final int PORT = PROPS.getCassandraPort();
 
 	@Override
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
similarity index 83%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
rename to spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
index e7bd1eb4f..fa2bf9bad 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
@@ -4,15 +4,15 @@ import java.io.InputStream;
 import java.util.Properties;
 
 @SuppressWarnings("serial")
-public class BuildProperties extends Properties {
+public class SpringCassandraBuildProperties extends Properties {
 
 	protected String resourceName = null;
 
-	public BuildProperties() {
-		this("/" + BuildProperties.class.getName() + ".properties");
+	public SpringCassandraBuildProperties() {
+		this("/" + SpringCassandraBuildProperties.class.getName() + ".properties");
 	}
 
-	protected BuildProperties(String resourceName) {
+	protected SpringCassandraBuildProperties(String resourceName) {
 		this.resourceName = resourceName;
 
 		loadProperties();
diff --git a/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties b/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties
similarity index 100%
rename from spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties
rename to spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
index d97f967ce..ff1dd0201 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
+++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
@@ -8,7 +8,7 @@
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
 
 	<cass:cluster port="${build.cassandra.native_transport_port}">
 		<cass:keyspace action="CREATE_DROP" durable-writes="true"
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
index 28cb23b1d..c2d5abbe5 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
+++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
@@ -8,7 +8,7 @@
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
 
 	<cass:cluster port="${build.cassandra.native_transport_port}">
 		<cass:keyspace action="CREATE_DROP" name="minimal" />
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
index c3e6130fd..8be74d6a8 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
+++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
@@ -7,7 +7,7 @@
                          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
 
 	<cassandra:cluster port="${build.cassandra.native_transport_port}" />
 
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
index 4a90de430..7f63c803a 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
+++ b/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
@@ -7,7 +7,7 @@
                          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
 
 	<cassandra:cluster id="cassandra-cluster"
 		contact-points="localhost" port="${build.cassandra.native_transport_port}">
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
index caf1cb27b..6c97490c4 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.cassandra.core.CassandraOperations;
-import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties;
+import org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties;
 import org.springframework.data.cassandra.test.integration.template.CassandraDataOperationsTest.Config;
 import org.springframework.util.Assert;
 
@@ -25,7 +25,7 @@ public class AbstractSpringDataEmbeddedCassandraIntegrationTest extends Abstract
 	public static List<TableMetadata> TABLES;
 
 	static {
-		SpringDataBuildProperties props = new SpringDataBuildProperties();
+		SpringDataCassandraBuildProperties props = new SpringDataCassandraBuildProperties();
 		CASSANDRA_NATIVE_PORT = props.getCassandraPort();
 	}
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
index d578865da..1b66f649b 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/config/TestConfig.java
@@ -3,7 +3,7 @@ package org.springframework.data.cassandra.test.integration.config;
 import org.springframework.cassandra.test.unit.support.Utils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration;
-import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties;
+import org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties;
 
 /**
  * Setup any spring configuration for unit tests
@@ -14,7 +14,7 @@ import org.springframework.data.cassandra.test.integration.support.SpringDataBui
 @Configuration
 public class TestConfig extends AbstractSpringDataCassandraConfiguration {
 
-	public static final SpringDataBuildProperties PROPS = new SpringDataBuildProperties();
+	public static final SpringDataCassandraBuildProperties PROPS = new SpringDataCassandraBuildProperties();
 	public static final int PORT = PROPS.getCassandraPort();
 	public static final int RPC_PORT = PROPS.getCassandraRpcPort();
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java
deleted file mode 100644
index 6e2527d27..000000000
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.springframework.data.cassandra.test.integration.support;
-
-import org.springframework.cassandra.test.integration.support.BuildProperties;
-
-@SuppressWarnings("serial")
-public class SpringDataBuildProperties extends BuildProperties {
-
-	public SpringDataBuildProperties() {
-		super("/" + SpringDataBuildProperties.class.getName() + ".properties");
-	}
-}
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java
new file mode 100644
index 000000000..ff0379648
--- /dev/null
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java
@@ -0,0 +1,11 @@
+package org.springframework.data.cassandra.test.integration.support;
+
+import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties;
+
+@SuppressWarnings("serial")
+public class SpringDataCassandraBuildProperties extends SpringCassandraBuildProperties {
+
+	public SpringDataCassandraBuildProperties() {
+		super("/" + SpringDataCassandraBuildProperties.class.getName() + ".properties");
+	}
+}
diff --git a/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties b/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties
similarity index 100%
rename from spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties
rename to spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties