diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/illegal-index1-tests-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/illegal-index1-tests-context.xml
index 1937d1997..ebff6a69c 100644
--- a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/illegal-index1-tests-context.xml
+++ b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/illegal-index1-tests-context.xml
@@ -9,7 +9,7 @@
 		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
     <context:annotation-config/>
-    <neo4j:config graphDatabaseService="graphDatabaseService" />
+    <neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.illegal.aspects.index1.dummy" />
 
     <bean id="indexCreationMappingEventListener" class="org.springframework.data.neo4j.support.mapping.DefaultEntityIndexCreator">
         <constructor-arg ref="indexProvider" />
diff --git a/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml b/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
index dd1cfa97a..3e04e20b0 100644
--- a/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
+++ b/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
@@ -12,7 +12,7 @@
 	<context:spring-configured/>
 	<context:annotation-config/>
 
-    <neo4j:config storeDirectory="target/config-test" entityManagerFactory="entityManagerFactory"/>
+    <neo4j:config storeDirectory="target/config-test" entityManagerFactory="entityManagerFactory" base-package="org.springframework.data.neo4j.config.cross"/>
 
     <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
         <property name="dataSource" ref="dataSource"/>
@@ -25,4 +25,4 @@
         <property name="password" value=""/>
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
index 039473784..fcf04562d 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
@@ -67,7 +67,7 @@ import javax.enterprise.inject.Produces;
  * @author Thomas Risberg
  */
 @Configuration
-public abstract class Neo4jConfiguration { // implements TransactionManagementConfigurer {
+public class Neo4jConfiguration {
     private GraphDatabaseService graphDatabaseService;
 
     private ConversionService conversionService;
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseServiceFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseServiceFactoryBean.java
index 1d32f6fd7..30bf353c0 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseServiceFactoryBean.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseServiceFactoryBean.java
@@ -63,6 +63,7 @@ public class GraphDatabaseServiceFactoryBean implements FactoryBean<GraphDatabas
     public void shutdown() {
         if (database != null) {
             database.shutdown();
+            database = null;
         }
     }
 }
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/AuditingIntegrationTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/AuditingIntegrationTests.java
index d9e0cd631..bc8ad43b8 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/AuditingIntegrationTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/AuditingIntegrationTests.java
@@ -19,6 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.joda.time.DateTime;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/BasicJavaConfigTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/BasicJavaConfigTest.java
index 84394282e..aa490461c 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/BasicJavaConfigTest.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/BasicJavaConfigTest.java
@@ -1,6 +1,7 @@
 package org.springframework.data.neo4j.config;
 
 import org.junit.After;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Transaction;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java
index c574467d6..c18416173 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.data.neo4j.config;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java
index 7e5f7f0c1..230ca575d 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java
@@ -124,12 +124,12 @@ public class DataGraphNamespaceHandlerTests {
         Config config = ctx.getBean("config", Config.class);
         Neo4jTemplate template = config.neo4jTemplate;
         Assert.assertNotNull("template", template);
-        AbstractGraphDatabase graphDatabaseService = (AbstractGraphDatabase) template.getGraphDatabaseService();
+        GraphDatabaseAPI graphDatabaseService = (GraphDatabaseAPI) template.getGraphDatabaseService();
         String fileSeparator = "target" + System.getProperty("file.separator") + "config-test";
         Assert.assertTrue("store-dir", graphDatabaseService.getStoreDir().endsWith(fileSeparator));
         Assert.assertNotNull("graphDatabaseService",config.graphDatabaseService);
         Assert.assertNotNull("transactionManager",config.transactionManager);
-        config.graphDatabaseService.shutdown();
+//        config.graphDatabaseService.shutdown();
         return config;
         } finally {
             ctx.close();
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesJavaConfigTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesJavaConfigTests.java
index 2d6d807fd..3565cf5a3 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesJavaConfigTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesJavaConfigTests.java
@@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.neo4j.model.Person;
 import org.springframework.data.neo4j.repositories.ClassWithNestedRepository.NestedUserRepository;
 import org.springframework.data.neo4j.repositories.PersonRepository;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -38,6 +39,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
+@DirtiesContext
 public class NestedNeo4jRepositoriesJavaConfigTests {
 
 	@Configuration
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesNamspaceConfigTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesNamspaceConfigTests.java
index 7b3e581fb..f6c4033b6 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesNamspaceConfigTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesNamspaceConfigTests.java
@@ -18,10 +18,12 @@ package org.springframework.data.neo4j.config;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.neo4j.repositories.ClassWithNestedRepository.NestedUserRepository;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -32,6 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "DataGraphNamespaceHandlerTests-nested-repositories-context.xml")
+@DirtiesContext
 public class NestedNeo4jRepositoriesNamspaceConfigTests {
 
 	@Autowired NestedUserRepository fooRepository;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/spring/BasicJavaConfig.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/spring/BasicJavaConfig.java
index 29ed3a2b1..6e1cb04dd 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/spring/BasicJavaConfig.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/spring/BasicJavaConfig.java
@@ -15,7 +15,7 @@ public class BasicJavaConfig extends Neo4jConfiguration {
         setBasePackage("org.springframework.data.neo4j.model");
     }
 
-    @Bean
+    @Bean(destroyMethod = "shutdown")
     public GraphDatabaseService graphDatabaseService() {
         return new TestGraphDatabaseFactory().newImpermanentDatabase();
     }
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiExtensionIntegrationTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiExtensionIntegrationTests.java
index 884295742..eb7812159 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiExtensionIntegrationTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiExtensionIntegrationTests.java
@@ -35,6 +35,7 @@ import org.springframework.data.neo4j.model.Person;
  * @author Nicki Watt
  * @author Oliver Gierke
  */
+@Ignore
 public class CdiExtensionIntegrationTests {
 
 	static CdiTestContainer container;
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml
index 4834f7548..2ea7183ea 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml
@@ -9,7 +9,7 @@
 		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
     <context:annotation-config/>
-    <neo4j:config storeDirectory="target/config-test"/>
+    <neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.config"/>
 
     <bean name="neo4jTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
         <property name="dataSource" ref="dataSource"/>
@@ -21,4 +21,4 @@
         <property name="username" value="sa"/>
         <property name="password" value=""/>
     </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml
index 04c3baa28..0b68fcc1e 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml
@@ -9,12 +9,11 @@
 		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
     <context:annotation-config/>
-    <bean id="graphDbFactory" class="org.neo4j.graphdb.factory.GraphDatabaseFactory"/>
-    <bean id="graphDatabaseService" scope="singleton" destroy-method="shutdown" factory-bean="graphDbFactory" factory-method="newEmbeddedDatabase">
+    <bean id="graphDatabaseService" destroy-method="shutdown" class="org.springframework.data.neo4j.support.GraphDatabaseServiceFactoryBean">
         <constructor-arg value="target/config-test"/>
     </bean>
-    <neo4j:config graphDatabaseService="graphDatabaseService"/>
+    <neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.config"/>
     <bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
 
     <neo4j:repositories base-package="org.springframework.data.neo4j.model"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml
index 7eeebda37..e4ff43cff 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml
@@ -18,8 +18,8 @@
         </property>
     </bean>
 
-    <neo4j:config storeDirectory="target/config-test"/>
+    <neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.config"/>
     <neo4j:repositories base-package="org.springframework.data.neo4j.model"/>
     <bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml
index 3ffcc22db..f4cbe4997 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml
@@ -20,6 +20,6 @@
         </constructor-arg>
     </bean>
 
-    <neo4j:config graphDatabaseService="graphDatabaseService"/>
+    <neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.config"/>
     <bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml
index d1afa601d..0deafd9b9 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml
@@ -22,6 +22,6 @@
        </constructor-arg>
     </bean>
 
-    <neo4j:config graphDatabaseService="haDatabase"/>
+    <neo4j:config graphDatabaseService="haDatabase" base-package="org.springframework.data.neo4j.config"/>
     <bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-nested-repositories-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-nested-repositories-context.xml
index 74238b279..185d1485b 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-nested-repositories-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-nested-repositories-context.xml
@@ -3,10 +3,9 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:neo4j="http://www.springframework.org/schema/data/neo4j"
-       xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd">
 
     <context:annotation-config/>
     <neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.model"/>