diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ExtendedTransactionsTests.java
similarity index 91%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ExtendedTransactionsTests.java
index d11a54782..7028e5436 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ExtendedTransactionsTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions;
+package org.springframework.data.neo4j.transaction;
 
 import static org.junit.Assert.*;
 
@@ -27,9 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
-import org.springframework.data.neo4j.transactions.service.ServiceA;
-import org.springframework.data.neo4j.transactions.service.ServiceB;
-import org.springframework.data.neo4j.transactions.service.WrapperService;
+import org.springframework.data.neo4j.transaction.service.ServiceA;
+import org.springframework.data.neo4j.transaction.service.ServiceB;
+import org.springframework.data.neo4j.transaction.service.WrapperService;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -138,8 +138,8 @@ public class ExtendedTransactionsTests {
 	}
 
 	@Configuration
-	@Neo4jIntegrationTest(domainPackages = "org.springframework.data.neo4j.transactions.domain",
-			repositoryPackages = "org.springframework.data.neo4j.transactions.repo")
-	@ComponentScan("org.springframework.data.neo4j.transactions.service")
+	@Neo4jIntegrationTest(domainPackages = "org.springframework.data.neo4j.transaction.domain",
+			repositoryPackages = "org.springframework.data.neo4j.transaction.repo")
+	@ComponentScan("org.springframework.data.neo4j.transaction.service")
 	static class ApplicationConfig {}
 }
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionIntegrationTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionIntegrationTests.java
similarity index 98%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionIntegrationTests.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionIntegrationTests.java
index 269f1b432..d9974bcfd 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionIntegrationTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionIntegrationTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions;
+package org.springframework.data.neo4j.transaction;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionRollbackTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionRollbackTests.java
similarity index 98%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionRollbackTests.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionRollbackTests.java
index 97e0a5c66..2685cb1f1 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/TransactionRollbackTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/TransactionRollbackTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions;
+package org.springframework.data.neo4j.transaction;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/domain/User.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/domain/User.java
similarity index 95%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/domain/User.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/domain/User.java
index 055b49f1f..a348686cc 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/domain/User.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/domain/User.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.domain;
+package org.springframework.data.neo4j.transaction.domain;
 
 import org.neo4j.ogm.annotation.Transient;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/repo/UserRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/repo/UserRepository.java
similarity index 88%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/repo/UserRepository.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/repo/UserRepository.java
index 69a5dd0ea..6ca2ba56e 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/repo/UserRepository.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/repo/UserRepository.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.repo;
+package org.springframework.data.neo4j.transaction.repo;
 
 import java.util.Collection;
 
 import org.springframework.data.neo4j.repository.Neo4jRepository;
-import org.springframework.data.neo4j.transactions.domain.User;
+import org.springframework.data.neo4j.transaction.domain.User;
 import org.springframework.stereotype.Repository;
 
 /**
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/BusinessService.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/BusinessService.java
similarity index 96%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/BusinessService.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/BusinessService.java
index 5f8436050..142058d60 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/BusinessService.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/BusinessService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.service;
+package org.springframework.data.neo4j.transaction.service;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceA.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceA.java
similarity index 85%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceA.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceA.java
index bb2a6129b..a78888a24 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceA.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceA.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.service;
+package org.springframework.data.neo4j.transaction.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.neo4j.transactions.domain.User;
-import org.springframework.data.neo4j.transactions.repo.UserRepository;
+import org.springframework.data.neo4j.transaction.domain.User;
+import org.springframework.data.neo4j.transaction.repo.UserRepository;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceB.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceB.java
similarity index 86%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceB.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceB.java
index 07bd423de..aa40b9a31 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/ServiceB.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/ServiceB.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.service;
+package org.springframework.data.neo4j.transaction.service;
 
 import java.util.Collection;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.neo4j.transactions.domain.User;
-import org.springframework.data.neo4j.transactions.repo.UserRepository;
+import org.springframework.data.neo4j.transaction.domain.User;
+import org.springframework.data.neo4j.transaction.repo.UserRepository;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/WrapperService.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/WrapperService.java
similarity index 96%
rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/WrapperService.java
rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/WrapperService.java
index a0a9b0d0d..dd546acad 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/service/WrapperService.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/service/WrapperService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.neo4j.transactions.service;
+package org.springframework.data.neo4j.transaction.service;
 
 import java.util.Map;