diff --git a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
index 62dbd2109e..bef4fae45d 100644
--- a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
@@ -16,30 +16,30 @@
 
 package com.example
 
-import com.example.BookDeleter;
-import com.example.CamelMessagingApplication;
-import com.jayway.jsonpath.DocumentContext
-import com.jayway.jsonpath.JsonPath
-import com.toomuchcoding.jsonassert.JsonAssertion
+import javax.inject.Inject
+
+import org.apache.camel.model.ModelCamelContext
+import org.junit.BeforeClass
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
-import org.apache.camel.model.ModelCamelContext
-import org.junit.BeforeClass;
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
+
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-import javax.inject.Inject
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import com.toomuchcoding.jsonassert.JsonAssertion
 /**
  * SPIKE ON TESTS FROM NOTES IN MessagingSpec
  */
 // Context configuration would end up in base class
-@ContextConfiguration(classes = [CamelMessagingApplication], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [CamelMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
 public class CamelMessagingApplicationSpec extends Specification {
 
diff --git a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
index 674dd4308c..ac6b2b7d02 100644
--- a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
@@ -19,7 +19,7 @@ package com.example
 import javax.inject.Inject
 
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
@@ -33,7 +33,7 @@ import com.jayway.jsonpath.DocumentContext
 import com.jayway.jsonpath.JsonPath
 import com.toomuchcoding.jsonassert.JsonAssertion
 // Context configuration would end up in base class
-@ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
 public class IntegrationMessagingApplicationSpec extends Specification {
 
diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
index 6c20d22ff2..30b34752e1 100644
--- a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
+++ b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
@@ -20,7 +20,7 @@ import javax.inject.Inject
 
 import org.junit.BeforeClass
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
@@ -38,7 +38,7 @@ import com.toomuchcoding.jsonassert.JsonAssertion
  * SPIKE ON TESTS FROM NOTES IN MessagingSpec
  */
 // Context configuration would end up in base class
-@ContextConfiguration(classes = [SpringMessagingApplication], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [SpringMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
 public class SpringApplicationSpec extends Specification {
 
diff --git a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
index ee8857cc5f..ecd57f8bcd 100644
--- a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
+++ b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
@@ -19,7 +19,7 @@ package com.example
 import javax.inject.Inject
 
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
@@ -36,7 +36,7 @@ import com.toomuchcoding.jsonassert.JsonAssertion
  * SPIKE ON TESTS FROM NOTES IN MessagingSpec
  */
 // Context configuration would end up in base class
-@ContextConfiguration(classes = [StreamMessagingApplication], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [StreamMessagingApplication], loader = SpringBootContextLoader)
 @DirtiesContext
 public class StreamMessagingApplicationSpec extends Specification {