diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java
index 67d2393a8..f28eb59ce 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java
@@ -63,10 +63,6 @@ public class DelegatingGraphDatabase implements GraphDatabase {
     private ResultConverter resultConverter;
     private volatile CypherQueryEngineImpl cypherQueryEngine;
 
-    // just for CDI
-    public DelegatingGraphDatabase() {
-    }
-
     public DelegatingGraphDatabase(final GraphDatabaseService delegate) {
         this(delegate,null);
     }
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 93b914d0a..884295742 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,7 +35,6 @@ import org.springframework.data.neo4j.model.Person;
  * @author Nicki Watt
  * @author Oliver Gierke
  */
-@Ignore("Bad transaction handling")
 public class CdiExtensionIntegrationTests {
 
 	static CdiTestContainer container;
@@ -52,7 +51,6 @@ public class CdiExtensionIntegrationTests {
 	}
 
 	@Test
-	@SuppressWarnings("null")
 	public void testRepositoryStyle1IsCreatedCorrectly() {
 
 		GraphDatabase database = container.getInstance(GraphDatabase.class);
@@ -82,7 +80,6 @@ public class CdiExtensionIntegrationTests {
 	}
 
 	@Test
-	@SuppressWarnings("null")
 	public void testRepositoryStyle2IsCreatedCorrectly() {
 
 		GraphDatabase database = container.getInstance(GraphDatabase.class);
@@ -112,7 +109,6 @@ public class CdiExtensionIntegrationTests {
 	}
 
 	@Test
-	@SuppressWarnings("null")
 	public void neo4jCrudRepositorySubTypeWorks() {
 
 		GraphDatabase database = container.getInstance(GraphDatabase.class);
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository.java
index fcec3bf12..fd0292983 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository.java
@@ -17,7 +17,9 @@ package org.springframework.data.neo4j.repository.cdi;
 
 import org.springframework.data.neo4j.model.Person;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.cdi.Eager;
 
+@Eager
 public interface CdiPersonRepository extends Repository<Person, Long> {
 
     void deleteAll();
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository2.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository2.java
index 72ada8e2b..a98f9abfd 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository2.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository2.java
@@ -17,8 +17,7 @@ package org.springframework.data.neo4j.repository.cdi;
 
 import org.springframework.data.neo4j.model.Person;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.cdi.Eager;
 
-public interface CdiPersonRepository2 extends CrudRepository<Person, Long> {
-
-
-}
+@Eager
+public interface CdiPersonRepository2 extends CrudRepository<Person, Long> {}
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository3.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository3.java
index b0d106355..073343a7c 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository3.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiPersonRepository3.java
@@ -17,9 +17,7 @@ package org.springframework.data.neo4j.repository.cdi;
 
 import org.springframework.data.neo4j.model.Person;
 import org.springframework.data.neo4j.repository.CRUDRepository;
+import org.springframework.data.repository.cdi.Eager;
 
-
-public interface CdiPersonRepository3 extends CRUDRepository<Person> {
-
-
-}
+@Eager
+public interface CdiPersonRepository3 extends CRUDRepository<Person> {}
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/SamplePersonRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/SamplePersonRepository.java
index a27c47317..56b7761cf 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/SamplePersonRepository.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/SamplePersonRepository.java
@@ -17,11 +17,11 @@ package org.springframework.data.neo4j.repository.cdi;
 
 import org.springframework.data.neo4j.model.Person;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.cdi.Eager;
 
 /**
- * @author Mark Paluch
  * @see DATAGRAPH-500
+ * @author Mark Paluch
  */
-public interface SamplePersonRepository extends Repository<Person, Long>, SamplePersonRepositoryCustom {
-
-}
+@Eager
+public interface SamplePersonRepository extends Repository<Person, Long>, SamplePersonRepositoryCustom {}