diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
index 892aaf24f1..e2e3ea6f97 100644
--- a/spring-katharsis/pom.xml
+++ b/spring-katharsis/pom.xml
@@ -3,11 +3,12 @@
   <groupId>org.springframework.samples</groupId>
   <artifactId>spring-katharsis</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+  <packaging>war</packaging>
   
   <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.6.RELEASE</version>
+        <version>1.3.3.RELEASE</version>
     </parent>
 
     <dependencies>
@@ -62,6 +63,7 @@
         <java.version>1.8</java.version>
         <katharsis.version>1.0.0</katharsis.version>
         <restassured.version>2.4.0</restassured.version>
+        <cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
     </properties>
 
 
@@ -71,7 +73,100 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                         <exclude>**/*LiveTest.java</exclude> 
+                    </excludes>
+                    <systemPropertyVariables>
+                        <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>tomcat8x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+
         </plugins>
+
     </build>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>start-server</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-server</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*LiveTest.java</include>
+                                    </includes>
+                                    <systemPropertyVariables>
+                                        <webTarget>cargo</webTarget>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+       
     
 </project>
diff --git a/spring-katharsis/src/main/java/org/baeldung/Application.java b/spring-katharsis/src/main/java/org/baeldung/Application.java
index 1b409f8b91..e7beb16e04 100644
--- a/spring-katharsis/src/main/java/org/baeldung/Application.java
+++ b/spring-katharsis/src/main/java/org/baeldung/Application.java
@@ -2,9 +2,10 @@ package org.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class Application {
+public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/spring-katharsis/src/main/resources/application.properties b/spring-katharsis/src/main/resources/application.properties
index 25d4559e3d..b55fdbba03 100644
--- a/spring-katharsis/src/main/resources/application.properties
+++ b/spring-katharsis/src/main/resources/application.properties
@@ -3,4 +3,7 @@ spring.datasource.username = sa
 spring.datasource.password =
 spring.jpa.show-sql = false
 spring.jpa.hibernate.ddl-auto = create-drop
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
\ No newline at end of file
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
+
+server.port=8082
+server.context-path=/spring-katharsis
\ No newline at end of file
diff --git a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java
index bbddba3490..26a8c42a25 100644
--- a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java
+++ b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java
@@ -2,22 +2,14 @@ package org.baeldung.test;
 
 import static org.junit.Assert.assertEquals;
 
-import org.baeldung.Application;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 
 import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.response.Response;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Application.class)
-@WebAppConfiguration
 public class JsonApiLiveTest {
 
-    private final static String URL_PREFIX = "http://localhost:8080/users";
+    private final static String URL_PREFIX = "http://localhost:8082/spring-katharsis/users";
 
     @Test
     public void whenGettingAllUsers_thenCorrect() {