diff --git a/src/test/java/guru/springframework/SpringBootWebApplicationTests.java b/src/test/java/guru/springframework/SpringBootWebApplicationTests.java
index a1db764b..fab8c483 100644
--- a/src/test/java/guru/springframework/SpringBootWebApplicationTests.java
+++ b/src/test/java/guru/springframework/SpringBootWebApplicationTests.java
@@ -2,12 +2,13 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SpringBootWebApplication.class)
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootWebApplication.class)
 @WebAppConfiguration
 public class SpringBootWebApplicationTests {
 
diff --git a/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java b/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java
index 1171ffc8..4f8aad2e 100644
--- a/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java
+++ b/src/test/java/guru/springframework/configuration/RepositoryConfiguration.java
@@ -1,7 +1,7 @@
 package guru.springframework.configuration;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.orm.jpa.EntityScan;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java b/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java
index 64297f69..49552983 100644
--- a/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java
+++ b/src/test/java/guru/springframework/repositories/ProductRepositoryTest.java
@@ -5,7 +5,7 @@
 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.context.junit4.SpringJUnit4ClassRunner;
 
 import java.math.BigDecimal;
@@ -15,7 +15,7 @@
 import static org.junit.Assert.assertNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = {RepositoryConfiguration.class})
+@SpringBootTest(classes = {RepositoryConfiguration.class})
 public class ProductRepositoryTest {
 
     private ProductRepository productRepository;