diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 368dfa19c1..4ac008cfc8 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -60,6 +60,26 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.subethamail</groupId>
+            <artifactId>subethasmtp</artifactId>
+            <version>3.1.7</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot/src/main/java/org/baeldung/Application.java b/spring-boot/src/main/java/org/baeldung/Application.java
new file mode 100644
index 0000000000..aae0c427a9
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/Application.java
@@ -0,0 +1,13 @@
+package org.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
+
+@org.springframework.boot.autoconfigure.SpringBootApplication
+public class Application {
+    private static ApplicationContext applicationContext;
+
+    public static void main(String[] args) {
+        applicationContext = SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java b/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java
new file mode 100644
index 0000000000..b6f88e7cd5
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java
@@ -0,0 +1,38 @@
+package org.baeldung.controller;
+
+import org.baeldung.domain.GenericEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+public class GenericEntityController {
+    private List<GenericEntity> entityList = new ArrayList<>();
+
+    {
+        entityList.add(new GenericEntity(1l, "entity_1"));
+        entityList.add(new GenericEntity(2l, "entity_2"));
+        entityList.add(new GenericEntity(3l, "entity_3"));
+        entityList.add(new GenericEntity(4l, "entity_4"));
+    }
+
+    @RequestMapping("/entity/all")
+    public List<GenericEntity> findAll() {
+        return entityList;
+    }
+
+    @RequestMapping(value = "/entity", method = RequestMethod.POST)
+    public GenericEntity addEntity(GenericEntity entity) {
+        entityList.add(entity);
+        return entity;
+    }
+
+    @RequestMapping("/entity/findby/{id}")
+    public GenericEntity findById(@PathVariable Long id) {
+        return entityList.stream().filter(entity -> entity.getId().equals(id)).findFirst().get();
+    }
+}
diff --git a/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java b/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java
new file mode 100644
index 0000000000..7b1d27cb66
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java
@@ -0,0 +1,42 @@
+package org.baeldung.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class GenericEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String value;
+
+    public GenericEntity() {
+    }
+
+    public GenericEntity(String value) {
+        this.value = value;
+    }
+
+    public GenericEntity(Long id, String value) {
+        this.id = id;
+        this.value = value;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java b/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java
new file mode 100644
index 0000000000..7bb1e6dcdc
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java
@@ -0,0 +1,7 @@
+package org.baeldung.repository;
+
+import org.baeldung.domain.GenericEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GenericEntityRepository extends JpaRepository<GenericEntity, Long> {
+}
diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties
index 8ee0ed29bc..78bcf4cc05 100644
--- a/spring-boot/src/main/resources/application.properties
+++ b/spring-boot/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8083
+server.port=8080
 server.contextPath=/springbootapp
 management.port=8081
 management.address=127.0.0.1
diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootApplicationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootApplicationTest.java
new file mode 100644
index 0000000000..ac7bcd62a9
--- /dev/null
+++ b/spring-boot/src/test/java/org/baeldung/SpringBootApplicationTest.java
@@ -0,0 +1,52 @@
+package org.baeldung;
+
+import org.baeldung.domain.GenericEntity;
+import org.baeldung.repository.GenericEntityRepository;
+import org.junit.Before;
+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.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import java.nio.charset.Charset;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Application.class)
+@WebAppConfiguration
+public class SpringBootApplicationTest {
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+
+    @Before
+    public void setupMockMvc() {
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext)
+                .build();
+    }
+
+    @Test
+    public void givenRequestHasBeenMade_whenMeetsAllOfGivenConditions_thenCorrect() throws Exception {
+        MediaType contentType = new MediaType(MediaType.APPLICATION_JSON.getType(),
+                MediaType.APPLICATION_JSON.getSubtype(),
+                Charset.forName("utf8"));
+
+        mockMvc.perform(MockMvcRequestBuilders.get("/entity/all")).
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andExpect(MockMvcResultMatchers.content().contentType(contentType)).
+                andExpect(jsonPath("$", hasSize(4)));
+    }
+}
diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootJPATest.java b/spring-boot/src/test/java/org/baeldung/SpringBootJPATest.java
new file mode 100644
index 0000000000..8a6b5139fe
--- /dev/null
+++ b/spring-boot/src/test/java/org/baeldung/SpringBootJPATest.java
@@ -0,0 +1,27 @@
+package org.baeldung;
+
+import org.baeldung.domain.GenericEntity;
+import org.baeldung.repository.GenericEntityRepository;
+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.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Application.class)
+public class SpringBootJPATest {
+    @Autowired
+    private GenericEntityRepository genericEntityRepository;
+
+    @Test
+    public void givenGenericEntityRepository_whenSaveAndRetreiveEntity_thenOK() {
+        GenericEntity genericEntity = genericEntityRepository.save(new GenericEntity("test"));
+        GenericEntity foundedEntity = genericEntityRepository.findOne(genericEntity.getId());
+        assertNotNull(foundedEntity);
+        assertEquals(genericEntity.getValue(), foundedEntity.getValue());
+    }
+}
diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootMailTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootMailTest.java
new file mode 100644
index 0000000000..2e436ece2e
--- /dev/null
+++ b/spring-boot/src/test/java/org/baeldung/SpringBootMailTest.java
@@ -0,0 +1,82 @@
+package org.baeldung;
+
+import org.junit.After;
+import org.junit.Before;
+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.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.context.WebApplicationContext;
+import org.subethamail.wiser.Wiser;
+import org.subethamail.wiser.WiserMessage;
+
+import javax.mail.MessagingException;
+import java.io.IOException;
+import java.util.List;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Application.class)
+public class SpringBootMailTest {
+    @Autowired
+    private JavaMailSender javaMailSender;
+
+    private Wiser wiser;
+
+    private String userTo = "user2@localhost";
+    private String userFrom = "user1@localhost";
+    private String subject = "Test subject";
+    private String textMail = "Text subject mail";
+
+    @Before
+    public void setUp() throws Exception {
+        final int TEST_PORT = 25;
+        wiser = new Wiser(TEST_PORT);
+        wiser.start();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        wiser.stop();
+    }
+
+    @Test
+    public void givenMail_whenSendAndReceived_thenCorrect() throws Exception {
+        SimpleMailMessage message = composeEmailMessage();
+        javaMailSender.send(message);
+        List<WiserMessage> messages = wiser.getMessages();
+
+        assertThat(messages, hasSize(1));
+        WiserMessage wiserMessage = messages.get(0);
+        assertEquals(userFrom, wiserMessage.getEnvelopeSender());
+        assertEquals(userTo, wiserMessage.getEnvelopeReceiver());
+        assertEquals(subject, getSubject(wiserMessage));
+        assertEquals(textMail, getMessage(wiserMessage));
+    }
+
+    private String getMessage(WiserMessage wiserMessage) throws MessagingException, IOException {
+        return wiserMessage.getMimeMessage().getContent().toString().trim();
+    }
+
+    private String getSubject(WiserMessage wiserMessage) throws MessagingException {
+        return wiserMessage.getMimeMessage().getSubject();
+    }
+
+
+    private SimpleMailMessage composeEmailMessage() {
+        SimpleMailMessage mailMessage = new SimpleMailMessage();
+        mailMessage.setTo(userTo);
+        mailMessage.setReplyTo(userFrom);
+        mailMessage.setFrom(userFrom);
+        mailMessage.setSubject(subject);
+        mailMessage.setText(textMail);
+        return mailMessage;
+    }
+}
diff --git a/spring-boot/src/test/resources/application.properties b/spring-boot/src/test/resources/application.properties
new file mode 100644
index 0000000000..bcfcf4b2fb
--- /dev/null
+++ b/spring-boot/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+spring.mail.host=localhost
+spring.mail.port=25
+spring.mail.properties.mail.smtp.auth=false
\ No newline at end of file