diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy
index 6a33ef9b3d..3934809b6e 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy
+++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/SpringJpaTest.groovy
@@ -1,9 +1,9 @@
 import datadog.trace.agent.test.AgentTestRunner
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import spock.lang.Shared
-import spring.Customer
-import spring.CustomerRepository
-import spring.PersistenceConfig
+import spring.jpa.Customer
+import spring.jpa.CustomerRepository
+import spring.jpa.PersistenceConfig
 
 
 /**
diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/Customer.java b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/Customer.java
similarity index 96%
rename from dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/Customer.java
rename to dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/Customer.java
index 6724d9fe01..7d6a67847d 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/Customer.java
+++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/Customer.java
@@ -1,4 +1,4 @@
-package spring;
+package spring.jpa;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/CustomerRepository.java b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/CustomerRepository.java
similarity index 91%
rename from dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/CustomerRepository.java
rename to dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/CustomerRepository.java
index 3edcb47e74..f9e0461f97 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/CustomerRepository.java
+++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/CustomerRepository.java
@@ -1,4 +1,4 @@
-package spring;
+package spring.jpa;
 
 import java.util.List;
 import org.springframework.data.repository.CrudRepository;
diff --git a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/PersistenceConfig.java b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/PersistenceConfig.java
similarity index 95%
rename from dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/PersistenceConfig.java
rename to dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/PersistenceConfig.java
index 9ad1f2fd73..c98f70232f 100644
--- a/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/PersistenceConfig.java
+++ b/dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/spring/jpa/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package spring;
+package spring.jpa;
 
 import java.util.Properties;
 import javax.sql.DataSource;
@@ -11,7 +11,7 @@ import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-@EnableJpaRepositories(basePackages = "spring")
+@EnableJpaRepositories(basePackages = "spring/jpa")
 public class PersistenceConfig {
 
   @Bean(name = "transactionManager")
@@ -30,7 +30,7 @@ public class PersistenceConfig {
 
     final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
     em.setDataSource(dataSource());
-    em.setPackagesToScan("spring");
+    em.setPackagesToScan("spring/jpa");
     em.setJpaVendorAdapter(vendorAdapter);
     em.setJpaProperties(additionalProperties());
 
diff --git a/dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy b/dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
index 3134315106..fceb61567a 100644
--- a/dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
+++ b/dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
@@ -2,9 +2,9 @@
 import datadog.trace.agent.test.AgentTestRunner
 import io.opentracing.tag.Tags
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
-import spring.Customer
-import spring.CustomerRepository
-import spring.PersistenceConfig
+import spring.jpa.Customer
+import spring.jpa.CustomerRepository
+import spring.jpa.PersistenceConfig
 
 class SpringJpaTest extends AgentTestRunner {
   def "test CRUD"() {
diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/Customer.java
similarity index 97%
rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java
rename to dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/Customer.java
index b233e1645b..5b4cc6ca4c 100644
--- a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java
+++ b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/Customer.java
@@ -1,6 +1,6 @@
 // This file includes software developed at SignalFx
 
-package spring;
+package spring.jpa;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/CustomerRepository.java
similarity index 93%
rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java
rename to dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/CustomerRepository.java
index 8f82a4f6a9..f53961bd7c 100644
--- a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java
+++ b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/CustomerRepository.java
@@ -1,6 +1,6 @@
 // This file includes software developed at SignalFx
 
-package spring;
+package spring.jpa;
 
 import java.util.List;
 import org.springframework.data.repository.CrudRepository;
diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/PersistenceConfig.java
similarity index 93%
rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java
rename to dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/PersistenceConfig.java
index d39470f94d..d4aa923e73 100644
--- a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java
+++ b/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/PersistenceConfig.java
@@ -1,6 +1,6 @@
 // This file includes software developed at SignalFx
 
-package spring;
+package spring.jpa;
 
 import javax.sql.DataSource;
 import org.springframework.context.annotation.Bean;
@@ -12,7 +12,7 @@ import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-@EnableJpaRepositories(basePackages = "spring")
+@EnableJpaRepositories(basePackages = "spring/jpa")
 public class PersistenceConfig {
 
   @Bean(name = "transactionManager")
@@ -31,7 +31,7 @@ public class PersistenceConfig {
 
     final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
     em.setDataSource(dataSource());
-    em.setPackagesToScan("spring");
+    em.setPackagesToScan("spring/jpa");
     em.setJpaVendorAdapter(vendorAdapter);
     return em;
   }