diff --git a/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java b/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
index f4a9420..d26b024 100644
--- a/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
+++ b/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
@@ -6,14 +6,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = BootstrapClientApplication.class)
-@WebIntegrationTest("server.port=0")
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class BootstrapClientApplicationTests {
 
diff --git a/bus/src/test/java/demo/StandaloneClientApplicationTests.java b/bus/src/test/java/demo/StandaloneClientApplicationTests.java
index 60a21cd..8c3e9c5 100644
--- a/bus/src/test/java/demo/StandaloneClientApplicationTests.java
+++ b/bus/src/test/java/demo/StandaloneClientApplicationTests.java
@@ -5,15 +5,13 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StandaloneClientApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class StandaloneClientApplicationTests {
 
diff --git a/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java b/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java
index f99abb8..64f5dfd 100644
--- a/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java
+++ b/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java
@@ -6,16 +6,14 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.config.client.ConfigClientProperties;
 import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = BootstrapDecryptionClientApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class BootstrapDecryptionClientApplicationTests {
 
diff --git a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java b/config-client/src/test/java/demo/StandaloneClientApplicationTests.java
index 60a21cd..8c3e9c5 100644
--- a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java
+++ b/config-client/src/test/java/demo/StandaloneClientApplicationTests.java
@@ -5,15 +5,13 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StandaloneClientApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class StandaloneClientApplicationTests {
 
diff --git a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java b/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
index 7a0d4c3..2b61b4e 100644
--- a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
+++ b/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
@@ -15,8 +15,7 @@ import org.junit.runner.RunWith;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.retry.annotation.AnnotationAwareRetryOperationsInterceptor;
@@ -24,15 +23,14 @@ import org.springframework.retry.backoff.ExponentialBackOffPolicy;
 import org.springframework.retry.interceptor.RetryOperationsInterceptor;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import apps.ConfigServer;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StandaloneClientApplication.class)
+@RunWith(SpringRunner.class)
 // Explicitly enable config client because test classpath has config server on it
-@IntegrationTest({ "spring.cloud.config.enabled=true",
+@SpringBootTest(properties={ "spring.cloud.config.enabled=true",
 		"logging.level.org.springframework.retry=TRACE" })
 @DirtiesContext
 public class StandaloneClientApplicationTests {
diff --git a/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java
index bb086bf..9120268 100644
--- a/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java
+++ b/configserver-bootstrap/src/test/java/demo/ConfigServerEurekaApplicationTests.java
@@ -2,14 +2,12 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConfigServerBootstrapApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class ConfigServerEurekaApplicationTests {
 
diff --git a/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java b/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java
index f56f57e..e5b8244 100644
--- a/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java
+++ b/configserver-eureka/src/test/java/demo/ConfigServerEurekaApplicationTests.java
@@ -1,20 +1,18 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConfigServerEurekaApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class ConfigServerEurekaApplicationTests {
 
diff --git a/configserver/src/test/java/demo/ConfigServerApplicationTests.java b/configserver/src/test/java/demo/ConfigServerApplicationTests.java
index 55a4328..a98bd1c 100644
--- a/configserver/src/test/java/demo/ConfigServerApplicationTests.java
+++ b/configserver/src/test/java/demo/ConfigServerApplicationTests.java
@@ -2,14 +2,12 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ConfigServerApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class ConfigServerApplicationTests {
 
diff --git a/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java b/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java
index 11b432d..46deec8 100644
--- a/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java
+++ b/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java
@@ -5,15 +5,13 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = EurekaClientApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class EurekaClientApplicationTests {
 
diff --git a/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
index 5a27ee6..30e3d21 100644
--- a/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
+++ b/eureka-first/src/test/java/demo/EurekaFirstApplicationTests.java
@@ -1,20 +1,18 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = EurekaFirstApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class EurekaFirstApplicationTests {
 
diff --git a/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java b/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java
index e1c825a..316db6b 100644
--- a/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java
+++ b/eureka-noweb/src/test/java/demo/NoopStandaloneClientApplicationTests.java
@@ -5,16 +5,14 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StandaloneClientApplication.class)
-@IntegrationTest({"eureka.client.enabled=false"})
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = "eureka.client.enabled=false")
 @DirtiesContext
 public class NoopStandaloneClientApplicationTests {
 
@@ -23,7 +21,8 @@ public class NoopStandaloneClientApplicationTests {
 
 	@Test
 	public void testDiscoveryClientIsNoop() {
-		assertTrue("discoveryClient is wrong instance type", discoveryClient instanceof NoopDiscoveryClient);
+		assertTrue("discoveryClient is wrong instance type",
+				discoveryClient instanceof NoopDiscoveryClient);
 	}
 
 }
diff --git a/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java b/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java
index 986b6bf..c20a007 100644
--- a/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java
+++ b/eureka-noweb/src/test/java/demo/StandaloneClientApplicationTests.java
@@ -5,16 +5,14 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StandaloneClientApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class StandaloneClientApplicationTests {
 
diff --git a/eureka-server/src/test/java/demo/EurekaFirstApplicationTests.java b/eureka-server/src/test/java/demo/EurekaFirstApplicationTests.java
index 3b28fe1..d04010e 100644
--- a/eureka-server/src/test/java/demo/EurekaFirstApplicationTests.java
+++ b/eureka-server/src/test/java/demo/EurekaFirstApplicationTests.java
@@ -5,16 +5,14 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = EurekaApplication.class)
-@DirtiesContext
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @WebAppConfiguration
 public class EurekaFirstApplicationTests {
 
diff --git a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
index 53ed263..650efca 100644
--- a/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
+++ b/feign-eureka/src/test/java/demo/HelloClientApplicationTests.java
@@ -1,25 +1,24 @@
 package demo;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HelloClientApplication.class)
-//We disable Hystrix because we are not concerned about testing circuit breakers in this test
-//and it eliminates hystrix timeouts from messing with the request
-@WebIntegrationTest(randomPort = true, value="feign.hystrix.enabled=false")
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+// We disable Hystrix because we are not concerned about testing circuit breakers in this
+// test and it eliminates hystrix timeouts from messing with the request
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "feign.hystrix.enabled=false")
 @DirtiesContext
 public class HelloClientApplicationTests {
 
@@ -28,7 +27,8 @@ public class HelloClientApplicationTests {
 
 	@Test
 	public void clientConnects() {
-		ResponseEntity<String> response = new TestRestTemplate().getForEntity("http://localhost:" + port, String.class);
+		ResponseEntity<String> response = new TestRestTemplate()
+				.getForEntity("http://localhost:" + port, String.class);
 		assertNotNull("response was null", response);
 		assertEquals("Wrong status code", HttpStatus.OK, response.getStatusCode());
 		assertTrue(response.getBody().contains("<html"));
diff --git a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
index c2c5b91..619e4e8 100644
--- a/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
+++ b/feign-eureka/src/test/java/demo/NoWebApplicationTests.java
@@ -1,20 +1,19 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HelloClientApplication.class)
-@WebIntegrationTest(value = "eureka.client.enabled=false", randomPort = true)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "eureka.client.enabled=false")
 @DirtiesContext
 public class NoWebApplicationTests {
 
@@ -23,7 +22,8 @@ public class NoWebApplicationTests {
 
 	@Test
 	public void testDiscoveryClientIsNoop() {
-		assertTrue("discoveryClient is wrong instance type", discoveryClient instanceof NoopDiscoveryClient);
+		assertTrue("discoveryClient is wrong instance type",
+				discoveryClient instanceof NoopDiscoveryClient);
 	}
 
 }
diff --git a/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java
index 9f15fd6..6031bda 100644
--- a/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java
+++ b/feign-hystrix/src/test/java/demo/FeignClientApplicationTests.java
@@ -1,26 +1,25 @@
 package demo;
 
-import demo.FeignClientApplicationTests.TestApplication;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
+
 import demo.FeignClientWithServerListApplicationTests.FallbackRestClient;
 
-import static org.junit.Assert.assertTrue;
 
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TestApplication.class)
-@WebIntegrationTest(randomPort = true)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class FeignClientApplicationTests {
 
diff --git a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index ca59572..d5ac4c1 100644
--- a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -1,28 +1,26 @@
 package demo;
 
-import demo.FeignClientWithServerListApplicationTests.TestApplication;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TestApplication.class)
 //Increase hystrix timeout or else requests timeout on CI server
-@WebIntegrationTest(randomPort = true, value = {"myexample.ribbon.listOfServers:example.com", "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"myexample.ribbon.listOfServers:example.com", "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
 @DirtiesContext
 public class FeignClientWithServerListApplicationTests {
 
diff --git a/feign/src/main/java/demo/FeignClientApplication.java b/feign/src/main/java/demo/FeignClientApplication.java
index a247a11..785c969 100644
--- a/feign/src/main/java/demo/FeignClientApplication.java
+++ b/feign/src/main/java/demo/FeignClientApplication.java
@@ -1,15 +1,13 @@
 package demo;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-@Configuration
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableFeignClients
 public class FeignClientApplication {
 
diff --git a/feign/src/test/java/demo/FeignClientApplicationTests.java b/feign/src/test/java/demo/FeignClientApplicationTests.java
index c2fdc26..88c5618 100644
--- a/feign/src/test/java/demo/FeignClientApplicationTests.java
+++ b/feign/src/test/java/demo/FeignClientApplicationTests.java
@@ -5,14 +5,13 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = FeignClientApplication.class)
-@WebIntegrationTest(randomPort = true)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class FeignClientApplicationTests {
 
diff --git a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index a29572e..d92d6ed 100644
--- a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -1,29 +1,27 @@
 package demo;
 
-import demo.FeignClientWithServerListApplicationTests.TestApplication;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TestApplication.class)
-//We disable Hystrix because we are not concerned about testing circuit breakers in this test
-//and it eliminates hystrix timeouts from messing with the request
-@WebIntegrationTest(randomPort = true, value = {"myexample.ribbon.listOfServers:example.com", "feign.hystrix.enabled=false"})
+@RunWith(SpringRunner.class)
+// We disable Hystrix because we are not concerned about testing circuit breakers in this
+// test and it eliminates hystrix timeouts from messing with the request
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
+		"myexample.ribbon.listOfServers:example.com", "feign.hystrix.enabled=false" })
 @DirtiesContext
 public class FeignClientWithServerListApplicationTests {
 
@@ -47,7 +45,7 @@ public class FeignClientWithServerListApplicationTests {
 
 	@FeignClient(value = "myexample")
 	static interface RestClient {
-		@RequestMapping(value="/", method=RequestMethod.GET)
+		@RequestMapping(value = "/", method = RequestMethod.GET)
 		String hello();
 	}
 }
diff --git a/hystrix-amqp/src/main/java/demo/HystrixApplication.java b/hystrix-amqp/src/main/java/demo/HystrixApplication.java
index d7a22e1..5e28a67 100644
--- a/hystrix-amqp/src/main/java/demo/HystrixApplication.java
+++ b/hystrix-amqp/src/main/java/demo/HystrixApplication.java
@@ -2,17 +2,13 @@ package demo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableCircuitBreaker
 @RestController
 public class HystrixApplication {
diff --git a/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java b/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
index 1f37dc3..3dcd474 100644
--- a/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
+++ b/hystrix-amqp/src/test/java/demo/HystrixApplicationTests.java
@@ -4,29 +4,26 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
 import java.io.InputStream;
 import java.net.URL;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HystrixApplication.class)
-@IntegrationTest("server.port=0")
-@WebAppConfiguration
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class HystrixApplicationTests {
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	int port;
 
 	@Test
diff --git a/hystrix/src/main/java/demo/HystrixApplication.java b/hystrix/src/main/java/demo/HystrixApplication.java
index 859015c..fcee781 100644
--- a/hystrix/src/main/java/demo/HystrixApplication.java
+++ b/hystrix/src/main/java/demo/HystrixApplication.java
@@ -2,18 +2,14 @@ package demo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableCircuitBreaker
 @RestController
 public class HystrixApplication {
diff --git a/hystrix/src/test/java/demo/HystrixApplicationTests.java b/hystrix/src/test/java/demo/HystrixApplicationTests.java
index 1f37dc3..3dcd474 100644
--- a/hystrix/src/test/java/demo/HystrixApplicationTests.java
+++ b/hystrix/src/test/java/demo/HystrixApplicationTests.java
@@ -4,29 +4,26 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
 import java.io.InputStream;
 import java.net.URL;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HystrixApplication.class)
-@IntegrationTest("server.port=0")
-@WebAppConfiguration
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class HystrixApplicationTests {
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	int port;
 
 	@Test
diff --git a/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java b/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
index 7e4e19d..ff0b1ad 100644
--- a/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
+++ b/netflix-sidecar/src/test/java/demo/SidecarApplicationTests.java
@@ -5,16 +5,14 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.netflix.appinfo.EurekaInstanceConfig;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SidecarApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class SidecarApplicationTests {
 
diff --git a/noweb/src/test/java/demo/NotWebApplicationTests.java b/noweb/src/test/java/demo/NotWebApplicationTests.java
index d5aad37..15c9c38 100644
--- a/noweb/src/test/java/demo/NotWebApplicationTests.java
+++ b/noweb/src/test/java/demo/NotWebApplicationTests.java
@@ -2,12 +2,12 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NotWebApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class NotWebApplicationTests {
 
diff --git a/noweb/src/test/java/demo/DiscoveryNotWebApplicationTests.java b/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java
similarity index 80%
rename from noweb/src/test/java/demo/DiscoveryNotWebApplicationTests.java
rename to noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java
index b94a4d8..515dd5b 100644
--- a/noweb/src/test/java/demo/DiscoveryNotWebApplicationTests.java
+++ b/noweb/src/test/java/test/DiscoveryNotWebApplicationTests.java
@@ -1,4 +1,4 @@
-package demo;
+package test;
 
 import static org.junit.Assert.assertTrue;
 
@@ -11,15 +11,15 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import demo.DiscoveryNotWebApplicationTests.NoDiscoveryApplication;
+import demo.NotWebApplication;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NoDiscoveryApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class DiscoveryNotWebApplicationTests {
 
 	@Autowired
diff --git a/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java b/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java
index 548298d..db07897 100644
--- a/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java
+++ b/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java
@@ -1,18 +1,16 @@
 package demo;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
 
-@Configuration
-@EnableAutoConfiguration
+@SpringBootApplication
 @RibbonClient("foo")
 @EnableOAuth2Client
 public class RibbonClientApplication {
diff --git a/oauth2-ribbon/src/test/java/demo/RibbonClientApplicationTests.java b/oauth2-ribbon/src/test/java/demo/RibbonClientApplicationTests.java
index 9eb2e04..d183789 100644
--- a/oauth2-ribbon/src/test/java/demo/RibbonClientApplicationTests.java
+++ b/oauth2-ribbon/src/test/java/demo/RibbonClientApplicationTests.java
@@ -8,23 +8,20 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.resource.UserRedirectRequiredException;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = RibbonClientApplication.class)
-@IntegrationTest({"debug=true", "server.port=0"})
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 public class RibbonClientApplicationTests {
 
 	@Autowired
diff --git a/oauth2-zuul/src/test/java/demo/ZuulApplicationTests.java b/oauth2-zuul/src/test/java/demo/ZuulApplicationTests.java
index 79ac75d..10c35a5 100644
--- a/oauth2-zuul/src/test/java/demo/ZuulApplicationTests.java
+++ b/oauth2-zuul/src/test/java/demo/ZuulApplicationTests.java
@@ -5,22 +5,18 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulApplication.class)
-@IntegrationTest({ "debug=true", "server.port=0" })
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 public class ZuulApplicationTests {
 
-	private RestTemplate restTemplate = new TestRestTemplate();
+	private TestRestTemplate restTemplate = new TestRestTemplate();
 
 	@Value("${local.server.port}")
 	int port;
diff --git a/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java b/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java
index f404136..0c10bb9 100644
--- a/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java
+++ b/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java
@@ -18,16 +18,13 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = RibbonDefaultConfigApplication.class)
-@WebAppConfiguration
-@IntegrationTest("server.port=0")
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class RibbonDefaultConfigApplicationTests {
 
diff --git a/ribbon-eureka/src/test/java/demo/HelloClientApplicationTests.java b/ribbon-eureka/src/test/java/demo/HelloClientApplicationTests.java
index 61fd95b..d6ff8c8 100644
--- a/ribbon-eureka/src/test/java/demo/HelloClientApplicationTests.java
+++ b/ribbon-eureka/src/test/java/demo/HelloClientApplicationTests.java
@@ -6,24 +6,21 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HelloClientApplication.class)
-@WebAppConfiguration
-@IntegrationTest("server.port=0")
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class HelloClientApplicationTests {
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	int port;
 
 	@Test
diff --git a/sleuth/src/test/java/demo/TraceApplicationTests.java b/sleuth/src/test/java/demo/TraceApplicationTests.java
index 8383e77..c95827a 100644
--- a/sleuth/src/test/java/demo/TraceApplicationTests.java
+++ b/sleuth/src/test/java/demo/TraceApplicationTests.java
@@ -1,20 +1,19 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.cloud.sleuth.trace.DefaultTracer;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TraceApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class TraceApplicationTests {
 
diff --git a/stream-bus/src/test/java/demo/StreamBusApplicationTests.java b/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
index f4e912f..085703e 100644
--- a/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
+++ b/stream-bus/src/test/java/demo/StreamBusApplicationTests.java
@@ -6,8 +6,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.bus.SpringCloudBusClient;
 import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent;
 import org.springframework.cloud.stream.messaging.Source;
@@ -15,11 +14,10 @@ import org.springframework.cloud.stream.test.binder.MessageCollector;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = StreamBusApplication.class)
-@IntegrationTest
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class StreamBusApplicationTests {
 
diff --git a/turbine-amqp/src/test/java/demo/TurbineStreamApplicationTests.java b/turbine-amqp/src/test/java/demo/TurbineStreamApplicationTests.java
index 8ae41de..505262f 100644
--- a/turbine-amqp/src/test/java/demo/TurbineStreamApplicationTests.java
+++ b/turbine-amqp/src/test/java/demo/TurbineStreamApplicationTests.java
@@ -5,14 +5,14 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TurbineStreamApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class TurbineStreamApplicationTests {
 
diff --git a/turbine/src/test/java/demo/TurbineApplicationTests.java b/turbine/src/test/java/demo/TurbineApplicationTests.java
index 4aedc96..daa7538 100644
--- a/turbine/src/test/java/demo/TurbineApplicationTests.java
+++ b/turbine/src/test/java/demo/TurbineApplicationTests.java
@@ -5,14 +5,14 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TurbineApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class TurbineApplicationTests {
 
diff --git a/vanilla/src/test/java/demo/VanillaApplicationTests.java b/vanilla/src/test/java/demo/VanillaApplicationTests.java
index e2aa59b..04d5be7 100644
--- a/vanilla/src/test/java/demo/VanillaApplicationTests.java
+++ b/vanilla/src/test/java/demo/VanillaApplicationTests.java
@@ -5,15 +5,13 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = VanillaApplication.class)
-@WebIntegrationTest(randomPort = true)
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class VanillaApplicationTests {
 
diff --git a/zipkin/src/test/java/demo/ZipkinApplicationTests.java b/zipkin/src/test/java/demo/ZipkinApplicationTests.java
index 720edf3..988341f 100644
--- a/zipkin/src/test/java/demo/ZipkinApplicationTests.java
+++ b/zipkin/src/test/java/demo/ZipkinApplicationTests.java
@@ -5,15 +5,13 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.sleuth.zipkin.ZipkinSpanListener;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZipkinApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class ZipkinApplicationTests {
 
diff --git a/zuul-config-discovery/src/test/java/demo/ZuulConfigDiscoveryApplicationTests.java b/zuul-config-discovery/src/test/java/demo/ZuulConfigDiscoveryApplicationTests.java
index cce1dfe..ace77bd 100644
--- a/zuul-config-discovery/src/test/java/demo/ZuulConfigDiscoveryApplicationTests.java
+++ b/zuul-config-discovery/src/test/java/demo/ZuulConfigDiscoveryApplicationTests.java
@@ -1,28 +1,23 @@
 package demo;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulConfigDiscoveryApplication.class)
-@WebIntegrationTest(randomPort = true)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
 public class ZuulConfigDiscoveryApplicationTests {
 
-    @Value("${local.server.port}")
-    private int port;
+	@LocalServerPort
+	private int port;
 
-
-    //FIXME: works fine when running the app, but not as a test
-    @Test
-	@Ignore
-    public void contextLoads() {
-    }
+	@Test
+	public void contextLoads() {
+	}
 
 }
diff --git a/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java b/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
index 3f7a750..ba7df66 100644
--- a/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
+++ b/zuul-proxy-eureka/src/test/java/demo/ZuulProxyEurekaApplicationTests.java
@@ -1,20 +1,18 @@
 package demo;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulProxyEurekaApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 @DirtiesContext
 public class ZuulProxyEurekaApplicationTests {
 
diff --git a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
index 327a6f2..75116cc 100644
--- a/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
+++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java
@@ -6,27 +6,26 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulProxyApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 @DirtiesContext
-@WebIntegrationTest(randomPort=true)
 public class ZuulProxyApplicationTests {
 
 	@Autowired
 	DiscoveryClient discoveryClient;
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	int port;
 
 	private TestRestTemplate restTemplate = new TestRestTemplate();
diff --git a/zuul/src/test/java/demo/ZuulApplicationTests.java b/zuul/src/test/java/demo/ZuulApplicationTests.java
index d980170..24fdfe5 100644
--- a/zuul/src/test/java/demo/ZuulApplicationTests.java
+++ b/zuul/src/test/java/demo/ZuulApplicationTests.java
@@ -7,24 +7,24 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClient;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = ZuulApplication.class)
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)
 @DirtiesContext
-@WebIntegrationTest(randomPort = true)
 public class ZuulApplicationTests {
 
 	@Autowired
 	DiscoveryClient discoveryClient;
 
-	@Value("${local.server.port}")
+	@LocalServerPort
 	int port;
 
 	@Test