diff --git a/instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle b/instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
index 283ac5b87b..a73f5196f8 100644
--- a/instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
+++ b/instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
@@ -27,14 +27,15 @@ dependencies {
 
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
   testLibrary group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
+  testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE'
 
   // JPA dependencies
   testImplementation project(':instrumentation:jdbc')
-  testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
   testImplementation group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4'
   testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
   testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
 
+  latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '(,2.4.0)'
   latestDepTestLibrary group: 'org.springframework', name: 'spring-context', version: '+'
 }
 
diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy
index 9f897ef7e0..a0c83ae8d0 100644
--- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy
+++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy
@@ -33,6 +33,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext>
     app.setDefaultProperties(ImmutableMap.of(
       "server.port", port,
       "server.context-path", getContextPath(),
+      "server.servlet.contextPath", getContextPath(),
       "server.error.include-message", "always"))
     def context = app.run()
     return context