diff --git a/mustache/pom.xml b/mustache/pom.xml
index 0c35345100..1b89997996 100644
--- a/mustache/pom.xml
+++ b/mustache/pom.xml
@@ -30,6 +30,11 @@
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/mustache/src/main/resources/application.properties b/mustache/src/main/resources/application.properties
index e69de29bb2..011bbae980 100644
--- a/mustache/src/main/resources/application.properties
+++ b/mustache/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.mustache.suffix:.html
\ No newline at end of file
diff --git a/spring-amqp-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java
similarity index 90%
rename from spring-amqp-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java
index f134074cf8..03cb34eeb5 100644
--- a/spring-amqp-simple/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-amqp-simple/src/test/java/org/baeldung/SpringContextManualTest.java
@@ -9,7 +9,7 @@ import com.baeldung.springamqpsimple.SpringAmqpApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringAmqpApplication.class)
-public class SpringContextIntegrationTest {
+public class SpringContextManualTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-kafka/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java
similarity index 90%
rename from spring-kafka/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java
index 40bf86c76f..b8195633fd 100644
--- a/spring-kafka/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-kafka/src/test/java/org/baeldung/SpringContextManualTest.java
@@ -9,7 +9,7 @@ import com.baeldung.spring.kafka.KafkaApplication;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = KafkaApplication.class)
-public class SpringContextIntegrationTest {
+public class SpringContextManualTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
similarity index 90%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
index 5dc6d1df75..a6ee0b6000 100644
--- a/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
@@ -9,7 +9,7 @@ import com.baeldung.server.AmqpServer;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = AmqpServer.class)
-public class SpringContextIntegrationTest {
+public class SpringContextManualTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextManualTest.java
similarity index 90%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextManualTest.java
index 5c9cc5f872..b806f21c27 100644
--- a/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/org/baeldung/SpringContextManualTest.java
@@ -9,7 +9,7 @@ import com.baeldung.server.JmsServer;
 
 @SpringBootTest(classes = JmsServer.class)
 @RunWith(SpringRunner.class)
-public class SpringContextIntegrationTest {
+public class SpringContextManualTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextLiveTest.java
similarity index 90%
rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java
rename to spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextLiveTest.java
index 3460792fc6..3bace4cd1e 100644
--- a/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/org/baeldung/SpringContextLiveTest.java
@@ -9,7 +9,7 @@ import com.baeldung.client.RmiClient;
 
 @SpringBootTest(classes = RmiClient.class)
 @RunWith(SpringRunner.class)
-public class SpringContextIntegrationTest {
+public class SpringContextLiveTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {