diff --git a/it/graceful-container-removal/pom.xml b/it/graceful-container-removal/pom.xml
new file mode 100644
index 000000000..9987dd09d
--- /dev/null
+++ b/it/graceful-container-removal/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.45-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>fabric8io</groupId>
+  <artifactId>dmp-it-graceful-container-removal</artifactId>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.fabric8</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <configuration>
+          <images>
+            <image>
+              <name>busybox</name>
+              <run>
+                <autoRemove>true</autoRemove>
+                <wait>
+                  <shutdown>128</shutdown>
+                </wait>
+              </run>
+            </image>
+          </images>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-docker</id>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop-docker</id>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/it/pom.xml b/it/pom.xml
index f2e186e97..18a8397b7 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -33,6 +33,7 @@
     <module>dockerfile-base-as-arg</module>
     <module>dockerfile-base-as-arg-buildconfig</module>
     <module>dockerignore</module>
+    <module>graceful-container-removal</module>
     <module>healthcheck</module>
     <module>helloworld</module>
     <module>log</module>