diff --git a/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java b/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java
deleted file mode 100644
index 72ccc0bfb8..0000000000
--- a/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.baeldung.boot;
-
-import org.baeldung.boot.components.FooService;
-import org.baeldung.boot.model.Foo;
-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.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(
-  classes = DemoApplication.class,
-  webEnvironment = WebEnvironment.RANDOM_PORT)
-public class FooComponentTests {
-
-    @Autowired
-    private TestRestTemplate testRestTemplate;
-
-    @SpyBean
-    private FooService fooService;
-
-    @Before
-    public void init() throws Exception {
-        Foo foo = new Foo();
-        foo.setId(5);
-        foo.setName("MOCKED_FOO");
-
-        doReturn(foo).when(fooService).getFooWithId(anyInt());
-
-        // doCallRealMethod().when(fooComponent).getFooWithName(anyString());
-    }
-
-    @Test
-    public void givenInquiryingFooWithId_whenFooComponentIsMocked_thenAssertMockedResult() {
-        Map<String, String> pathVariables = new HashMap<>();
-        pathVariables.put("id", "1");
-        ResponseEntity<Foo> fooResponse = testRestTemplate.getForEntity("/{id}", Foo.class, pathVariables);
-
-        assertNotNull(fooResponse);
-        assertEquals(HttpStatus.OK, fooResponse.getStatusCode());
-        assertEquals(5, fooResponse.getBody().getId().longValue());
-        assertEquals("MOCKED_FOO", fooResponse.getBody().getName());
-    }
-
-    @Test
-    public void givenInquiryingFooWithName_whenFooComponentIsMocked_thenAssertMockedResult() {
-        Map<String, String> pathVariables = new HashMap<>();
-        pathVariables.put("name", "Foo_Name");
-        ResponseEntity<Foo> fooResponse = testRestTemplate.getForEntity("/?name={name}", Foo.class, pathVariables);
-
-        assertNotNull(fooResponse);
-        assertEquals(HttpStatus.OK, fooResponse.getStatusCode());
-        assertEquals(1, fooResponse.getBody().getId().longValue());
-    }
-}
\ No newline at end of file
diff --git a/spring-boot/src/test/java/org/baeldung/boot/FooIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/FooIntegrationTest.java
deleted file mode 100644
index 932cce26d5..0000000000
--- a/spring-boot/src/test/java/org/baeldung/boot/FooIntegrationTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.baeldung.boot;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.baeldung.boot.DemoApplication;
-import org.baeldung.boot.model.Foo;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-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.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes=DemoApplication.class,webEnvironment = WebEnvironment.RANDOM_PORT)
-public class FooIntegrationTest {
-
-    @Autowired
-    private TestRestTemplate testRestTemplate;
-    
-    
-    @Test
-    public void givenInquiryingFooWithId_whenIdIsValid_thenHttpStatusOK(){
-        Map<String,String> pathVariables = new HashMap<String,String>();
-        pathVariables.put("id", "1");
-        ResponseEntity<Foo> fooResponse = testRestTemplate.getForEntity("/{id}", Foo.class, pathVariables);
-        Assert.assertNotNull(fooResponse);
-        Assert.assertEquals(HttpStatus.OK,fooResponse.getStatusCode());
-    }
-    
-    @Test
-    public void givenInquiryingFooWithName_whenNameIsValid_thenHttpStatusOK(){
-        Map<String,String> pathVariables = new HashMap<String,String>();
-        pathVariables.put("name", "Foo_Name");
-        ResponseEntity<Foo> fooResponse = testRestTemplate.getForEntity("/?name={name}", Foo.class, pathVariables);
-        Assert.assertNotNull(fooResponse);
-        Assert.assertEquals(HttpStatus.OK,fooResponse.getStatusCode());
-    }
-}
\ No newline at end of file
diff --git a/spring-boot/src/test/java/org/baeldung/boot/FooJPATest.java b/spring-boot/src/test/java/org/baeldung/boot/FooJPATest.java
deleted file mode 100644
index c29aa64e6c..0000000000
--- a/spring-boot/src/test/java/org/baeldung/boot/FooJPATest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.baeldung.boot;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.baeldung.boot.model.Foo;
-import org.baeldung.boot.repository.FooRepository;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@DataJpaTest
-public class FooJPATest {
-
-    @Autowired
-    private TestEntityManager entityManager;
-
-    @Autowired
-    private FooRepository repository;
-
-    @Test
-    public void findFooByName() {
-        this.entityManager.persist(new Foo("Foo_Name_2"));
-        Foo foo = this.repository.findByName("Foo_Name_2");
-        assertNotNull(foo);
-        assertEquals("Foo_Name_2",foo.getName());
-        // Due to having Insert query for Foo with Id 1, so TestEntityManager generates new Id of 2       
-        assertEquals(2l,foo.getId().longValue());
-    }
-}
\ No newline at end of file
diff --git a/spring-boot/src/test/java/org/baeldung/boot/FooJsonTest.java b/spring-boot/src/test/java/org/baeldung/boot/FooJsonTest.java
deleted file mode 100644
index 2789ed0a8c..0000000000
--- a/spring-boot/src/test/java/org/baeldung/boot/FooJsonTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.baeldung.boot;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.baeldung.boot.model.Foo;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.json.JsonTest;
-import org.springframework.boot.test.json.JacksonTester;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@JsonTest
-public class FooJsonTest {
-
-    @Autowired
-    private JacksonTester<Foo> json;
-  
-
-    @Test
-    public void testSerialize() throws Exception {
-        Foo foo = new Foo(3, "Foo_Name_3");
-        assertThat(this.json.write(foo)).isEqualToJson("expected.json");
-        assertThat(this.json.write(foo)).hasJsonPathStringValue("@.name");
-        assertThat(this.json.write(foo)).extractingJsonPathStringValue("@.name").isEqualTo("Foo_Name_3");
-    }
-
-    @Test
-    public void testDeserialize() throws Exception {
-        String content = "{\"id\":4,\"name\":\"Foo_Name_4\"}";
-        assertThat(this.json.parseObject(content).getName()).isEqualTo("Foo_Name_4");
-        assertThat(this.json.parseObject(content).getId()==4);
-    }
-}
\ No newline at end of file