diff --git a/pom.xml b/pom.xml
index ce8ee5b84..1693959ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,11 +77,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>${project.groupId}</groupId>
-				<artifactId>spring-cassandra</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-driver-core</artifactId>
@@ -293,18 +288,6 @@
 							</portNames>
 						</configuration>
 					</execution>
-					<execution>
-						<id>add-shared-source-dir</id>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<phase>generate-test-sources</phase>
-						<configuration>
-							<sources>
-								<source>../shared/src/test/java</source>
-							</sources>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -379,13 +362,6 @@
 					<include>**/*</include>
 				</includes>
 			</testResource>
-			<testResource>
-				<directory>../shared/src/test/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</testResource>
 		</testResources>
 	</build>
 </project>
diff --git a/spring-cassandra/pom.xml b/spring-cassandra/pom.xml
index 26dd63c0b..8c8fc619c 100644
--- a/spring-cassandra/pom.xml
+++ b/spring-cassandra/pom.xml
@@ -83,4 +83,21 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3.1</version>
+				<executions>
+					<execution>
+						<id>test-jar</id>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/shared/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
similarity index 100%
rename from shared/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
rename to spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
diff --git a/shared/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
similarity index 79%
rename from shared/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
rename to spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
index 2a07fda77..e7bd1eb4f 100644
--- a/shared/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
+++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/BuildProperties.java
@@ -6,15 +6,23 @@ import java.util.Properties;
 @SuppressWarnings("serial")
 public class BuildProperties extends Properties {
 
+	protected String resourceName = null;
+
 	public BuildProperties() {
-		this("/build.properties");
+		this("/" + BuildProperties.class.getName() + ".properties");
 	}
 
-	public BuildProperties(String resourceName) {
+	protected BuildProperties(String resourceName) {
+		this.resourceName = resourceName;
+
+		loadProperties();
+	}
+
+	public void loadProperties() {
 		loadProperties(resourceName);
 	}
 
-	public void loadProperties(String resourceName) {
+	protected void loadProperties(String resourceName) {
 		InputStream in = null;
 		try {
 			in = getClass().getResourceAsStream(resourceName);
diff --git a/shared/src/test/resources/build.properties b/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.properties
similarity index 100%
rename from shared/src/test/resources/build.properties
rename to spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.BuildProperties.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 ca02147d5..d97f967ce 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:build.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.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 109528a9d..28cb23b1d 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:build.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.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 fb716513d..c3e6130fd 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:build.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.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 ca3483d66..b40e1dfac 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:build.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.BuildProperties.properties" />
 
 	<cassandra:cluster id="cassandra-cluster"
 		contactPoints="localhost" port="${build.cassandra.native_transport_port}">
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index f0f7c6d0f..01c29f55c 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -25,6 +25,16 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cassandra</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cassandra</artifactId>
+			<version>${project.version}</version>
+			<type>test-jar</type>
+			<!-- <classifier>tests</classifier> -->
+			<scope>test</scope>
 		</dependency>
 
 		<!-- Spring -->
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 8df1af695..e5abe0393 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
@@ -1,6 +1,5 @@
 package org.springframework.data.cassandra.test.integration.config;
 
-import org.springframework.cassandra.test.integration.support.BuildProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration;
@@ -9,6 +8,7 @@ import org.springframework.data.cassandra.convert.MappingCassandraConverter;
 import org.springframework.data.cassandra.core.CassandraDataOperations;
 import org.springframework.data.cassandra.core.CassandraDataTemplate;
 import org.springframework.data.cassandra.mapping.DefaultCassandraMappingContext;
+import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties;
 
 /**
  * Setup any spring configuration for unit tests
@@ -19,7 +19,7 @@ import org.springframework.data.cassandra.mapping.DefaultCassandraMappingContext
 @Configuration
 public class TestConfig extends AbstractSpringDataCassandraConfiguration {
 
-	public static final BuildProperties PROPS = new BuildProperties();
+	public static final SpringDataBuildProperties PROPS = new SpringDataBuildProperties();
 	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
new file mode 100644
index 000000000..6e2527d27
--- /dev/null
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataBuildProperties.java
@@ -0,0 +1,11 @@
+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/template/CassandraDataOperationsTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java
index dc842eec2..1ff710eb9 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java
@@ -39,9 +39,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cassandra.core.ConsistencyLevel;
 import org.springframework.cassandra.core.QueryOptions;
 import org.springframework.cassandra.core.RetryPolicy;
-import org.springframework.cassandra.test.integration.support.BuildProperties;
 import org.springframework.data.cassandra.core.CassandraDataOperations;
 import org.springframework.data.cassandra.test.integration.config.TestConfig;
+import org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties;
 import org.springframework.data.cassandra.test.integration.table.Book;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -65,7 +65,7 @@ public class CassandraDataOperationsTest {
 
 	private static Logger log = LoggerFactory.getLogger(CassandraDataOperationsTest.class);
 
-	private final static BuildProperties PROPS = new BuildProperties();
+	public static final SpringDataBuildProperties PROPS = new SpringDataBuildProperties();
 	private final static String CASSANDRA_CONFIG = "cassandra.yaml";
 	private final static String KEYSPACE_NAME = "test";
 	private final static String CASSANDRA_HOST = "localhost";
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.SpringDataBuildProperties.properties
new file mode 100644
index 000000000..ba2281c73
--- /dev/null
+++ b/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataBuildProperties.properties
@@ -0,0 +1,4 @@
+build.cassandra.native_transport_port=@build.cassandra.native_transport_port@
+build.cassandra.rpc_port=@build.cassandra.rpc_port@
+build.cassandra.storage_port=@build.cassandra.storage_port@
+build.cassandra.ssl_storage_port=@build.cassandra.ssl_storage_port@
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties
index 242812e68..358cf0041 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/cassandra.properties
@@ -1,3 +1,3 @@
 cassandra.contactPoints=localhost
-cassandra.native_transport_port=${build.cassandra.native_transport_port}
+cassandra.native_transport_port=@build.cassandra.native_transport_port@
 cassandra.keyspace=TestKS123
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
index 65c4cc4d9..019515a25 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests-context.xml
@@ -13,7 +13,7 @@
 		location="classpath:/org/springframework/data/cassandra/test/integration/repository/cassandra.properties" />
 
 	<cassandra:cluster id="cassandra-cluster"
-		contactPoints="${cassandra.contactPoints}" port="${build.cassandra.native_transport_port}"
+		contactPoints="${cassandra.contactPoints}" port="${cassandra.native_transport_port}"
 		compression="SNAPPY">
 		<cassandra-base:local-pooling-options
 			min-simultaneous-requests="25" max-simultaneous-requests="100"
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/cassandra.properties b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/cassandra.properties
index 242812e68..358cf0041 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/cassandra.properties
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/repository/cassandra.properties
@@ -1,3 +1,3 @@
 cassandra.contactPoints=localhost
-cassandra.native_transport_port=${build.cassandra.native_transport_port}
+cassandra.native_transport_port=@build.cassandra.native_transport_port@
 cassandra.keyspace=TestKS123