diff --git a/pom.xml b/pom.xml
index 6a52dc867..17b44d6df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 			<name>Alex Shvid</name>
 			<email>a at shvid.com</email>
 			<roles>
-			    <role>Project Lead</role>
+				<role>Project Lead</role>
 				<role>Developer</role>
 			</roles>
 			<timezone>-8</timezone>
@@ -227,7 +227,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-			    	<argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>
+					<argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>
 					<parallel>methods</parallel>
 					<threadCount>10</threadCount>
 					<useFile>false</useFile>
@@ -247,7 +247,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<configuration>
-				    <argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>
+					<forkMode>always</forkMode>
+					<argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>
 					<useFile>false</useFile>
 					<includes>
 						<include>**/test/integration/**/*.java</include>
diff --git a/spring-cassandra/src/test/resources/cassandra.yaml b/spring-cassandra/src/test/resources/cassandra.yaml
index df542f82e..67c59aba4 100644
--- a/spring-cassandra/src/test/resources/cassandra.yaml
+++ b/spring-cassandra/src/test/resources/cassandra.yaml
@@ -339,7 +339,7 @@ native_transport_port: 9042
 # transport is used. They are similar to rpc_min_threads and rpc_max_threads,
 # though the defaults differ slightly.
 # native_transport_min_threads: 16
-native_transport_max_threads: 48
+#native_transport_max_threads: 48
 
 # Whether to start the thrift rpc server.
 start_rpc: true