diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java
index 443459a2b..b9f3bb682 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCassandraConfiguration.java
@@ -67,11 +67,6 @@ public abstract class AbstractCassandraConfiguration {
 		return bean;
 	}
 
-	@Bean
-	public CassandraOperations template() throws Exception {
-		return new CassandraTemplate(session().getObject());
-	}
-
 	protected List<String> getStartupScripts() {
 		return Collections.emptyList();
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
index 943662a02..ad6c84044 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
@@ -60,10 +60,12 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
 
 	/**
 	 * Creates a {@link CassandraAdminTemplate}.
+	 * 
+	 * @throws Exception
 	 */
 	@Bean
-	public CassandraAdminOperations adminTemplate() {
-		return new CassandraAdminTemplate(session());
+	public CassandraAdminOperations adminTemplate() throws Exception {
+		return new CassandraAdminTemplate(session().getObject());
 	}
 
 	/**
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 ce5f64d33..5cd565bfd 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,8 +1,5 @@
 package org.springframework.data.cassandra.test.integration.config;
 
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
-import org.springframework.cassandra.core.CassandraOperations;
-import org.springframework.cassandra.core.CassandraTemplate;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration;
@@ -12,9 +9,6 @@ import org.springframework.data.cassandra.core.CassandraDataOperations;
 import org.springframework.data.cassandra.core.CassandraDataTemplate;
 import org.springframework.data.cassandra.mapping.CassandraMappingContext;
 
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.Cluster.Builder;
-
 /**
  * Setup any spring configuration for unit tests
  * 
@@ -31,47 +25,13 @@ public class TestConfig extends AbstractSpringDataCassandraConfiguration {
 		return keyspaceName;
 	}
 
-	@Override
-	@Bean
-	public Cluster cluster() {
-
-		Builder builder = Cluster.builder();
-		builder.addContactPoint("127.0.0.1").withPort(9042);
-		return builder.build();
-	}
-
-	@Bean
-	public CassandraSessionFactoryBean sessionFactoryBean() {
-
-		CassandraSessionFactoryBean bean = new CassandraSessionFactoryBean();
-		bean.setCluster(cluster());
-		bean.setKeyspaceName(getKeyspaceName());
-		return bean;
-	}
-
-	@Bean
-	public CassandraOperations cassandraTemplate() {
-
-		CassandraOperations template = new CassandraTemplate(sessionFactoryBean().getObject());
-		return template;
-	}
-
 	@Bean
 	public CassandraConverter cassandraConverter() {
-
-		CassandraConverter converter = new MappingCassandraConverter(new CassandraMappingContext());
-
-		return converter;
-
+		return new MappingCassandraConverter(new CassandraMappingContext());
 	}
 
 	@Bean
-	public CassandraDataOperations cassandraDataTemplate() throws ClassNotFoundException {
-
-		CassandraDataOperations template = new CassandraDataTemplate(sessionFactoryBean().getObject(), converter(),
-				keyspaceName);
-
-		return template;
-
+	public CassandraDataOperations cassandraDataTemplate() throws Exception {
+		return new CassandraDataTemplate(session().getObject(), converter(), keyspaceName);
 	}
 }