diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index d9ab0c5..aaa95eb 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -269,230 +269,21 @@
     </profile>
 
     <profile>
-      <id>docker-qunit-tests</id>
+      <id>integration-tests</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>${exec.version}</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>mvn</executable>
-                  <arguments>
-                    <argument>clean</argument>
-                    <argument>package</argument>
-                    <argument>-Pdocker-tomcat</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.soebes.maven.plugins</groupId>
-            <artifactId>iterator-maven-plugin</artifactId>
-            <version>0.5.1</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>iterator</goal>
-                </goals>
-                <configuration>
-                  <items>
-                    <item>myfaces-2.1</item>
-                    <item>myfaces-2.2</item>
-                    <item>myfaces-2.3</item>
-                    <item>mojarra-2.0</item>
-                    <item>mojarra-2.1</item>
-                    <item>mojarra-2.2</item>
-                    <item>mojarra-2.3</item>
-                  </items>
-                  <pluginExecutors>
-                    <pluginExecutor>
-                      <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>${exec.version}</version>
-                      </plugin>
-                      <goal>exec</goal>
-                      <configuration>
-                        <executable>mvn</executable>
-                        <arguments>
-                          <argument>package</argument>
-                          <argument>-Pdocker-tomcat</argument>
-                          <argument>-Djsf=@item@</argument>
-                          <argument>-DfinalName=tobago-example-demo-@item@</argument>
-                        </arguments>
-                      </configuration>
-                    </pluginExecutor>
-                  </pluginExecutors>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>0.25.2</version>
-            <configuration>
-              <startParallel>true</startParallel>
-              <sourceDirectory>src/main/docker-tests</sourceDirectory>
-              <images>
-                <image>
-                  <name>tobago/tomcat8.5-jre8</name>
-                  <build>
-                    <from>tomcat:8.5-jre8</from>
-                    <tags>
-                      <tag>${project.parent.version}</tag>
-                    </tags>
-                    <assembly>
-                      <descriptor>assembly.xml</descriptor>
-                      <basedir>/usr/local/tomcat</basedir>
-                    </assembly>
-                  </build>
-                  <run>
-                    <ports>
-                      <port>8082:8080</port>
-                    </ports>
-                    <wait>
-                      <http>
-                        <url>http://localhost:8082/${project.artifactId}</url>
-                      </http>
-                      <time>180000</time>
-                    </wait>
-                  </run>
-                </image>
-                <image>
-                  <name>tobago/tomcat8.5-jre10</name>
-                  <build>
-                    <from>tomcat:8.5-jre10</from>
-                    <tags>
-                      <tag>${project.parent.version}</tag>
-                    </tags>
-                    <assembly>
-                      <descriptor>assembly.xml</descriptor>
-                      <basedir>/usr/local/tomcat</basedir>
-                    </assembly>
-                  </build>
-                  <run>
-                    <ports>
-                      <port>8083:8080</port>
-                    </ports>
-                    <wait>
-                      <http>
-                        <url>http://localhost:8083/${project.artifactId}</url>
-                      </http>
-                      <time>180000</time>
-                    </wait>
-                  </run>
-                </image>
-                <image>
-                  <alias>selenium-hub</alias>
-                  <name>selenium/hub:${selenium.version}</name>
-                  <run>
-                    <ports>
-                      <port>4444:4444</port>
-                    </ports>
-                    <wait>
-                      <http>
-                        <url>http://localhost:4444</url>
-                        <status>200</status>
-                      </http>
-                      <time>20000</time>
-                    </wait>
-                  </run>
-                </image>
-                <image>
-                  <name>selenium/node-chrome:${selenium.version}</name>
-                  <run>
-                    <dependsOn>
-                      <container>selenium-hub</container>
-                    </dependsOn>
-                    <links>
-                      <link>selenium-hub</link>
-                    </links>
-                    <env>
-                      <HUB_HOST>selenium-hub</HUB_HOST>
-                      <HOB_PORT>4444</HOB_PORT>
-                    </env>
-                    <ports>
-                      <port>5556:5555</port>
-                    </ports>
-                    <wait>
-                      <http>
-                        <url>http://localhost:5556</url>
-                        <status>200</status>
-                      </http>
-                      <time>20000</time>
-                    </wait>
-                  </run>
-                </image>
-                <image>
-                  <name>selenium/node-firefox:${selenium.version}</name>
-                  <run>
-                    <dependsOn>
-                      <container>selenium-hub</container>
-                    </dependsOn>
-                    <links>
-                      <link>selenium-hub</link>
-                    </links>
-                    <env>
-                      <HUB_HOST>selenium-hub</HUB_HOST>
-                      <HOB_PORT>4444</HOB_PORT>
-                    </env>
-                    <ports>
-                      <port>5557:5555</port>
-                    </ports>
-                    <!-- Set shm size to avoid firefox crashes: https://github.com/SeleniumHQ/docker-selenium/tree/3.12.0-boron#running-the-images -->
-                    <shmSize>1073741824</shmSize>
-                    <wait>
-                      <http>
-                        <url>http://localhost:5557</url>
-                        <status>200</status>
-                      </http>
-                      <time>20000</time>
-                    </wait>
-                  </run>
-                </image>
-              </images>
-            </configuration>
-            <executions>
-              <execution>
-                <id>start-container</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>stop</goal>
-                  <goal>build</goal>
-                  <goal>start</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>stop-container</id>
-                <phase>post-integration-test</phase>
-                <goals>
-                  <goal>stop</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
             <dependencies>
               <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-surefire-provider</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.2</version>
               </dependency>
             </dependencies>
             <configuration>
               <includes>
-                <include>qunit/*</include>
+                <include>integration/*</include>
               </includes>
             </configuration>
             <executions>
diff --git a/tobago-example/tobago-example-demo/src/main/docker-tests/assembly.xml b/tobago-example/tobago-example-demo/src/main/docker-tests/assembly.xml
deleted file mode 100644
index e795e1e..0000000
--- a/tobago-example/tobago-example-demo/src/main/docker-tests/assembly.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-  <id>tobago-example-demo</id>
-  <fileSets>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-myfaces-2.1.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-myfaces-2.2.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-myfaces-2.3.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-mojarra-2.0.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-mojarra-2.1.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-mojarra-2.2.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>webapps</outputDirectory>
-      <includes>
-        <include>tobago-example-demo-mojarra-2.3.war</include>
-      </includes>
-      <directory>target</directory>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/tobago-example/tobago-example-demo/src/main/docker-tests/tomcat/override-web.xml b/tobago-example/tobago-example-demo/src/main/docker-tests/tomcat/override-web.xml
deleted file mode 100644
index 5b69cc5..0000000
--- a/tobago-example/tobago-example-demo/src/main/docker-tests/tomcat/override-web.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<web-app
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    version="3.0">
-
-  <display-name>Tobago Demo Application</display-name>
-
-  <!-- for jetty also check src/test/jetty/override-myfaces-web.xml or src/test/jetty/override-mojarra-web.xml -->
-  <context-param>
-    <param-name>javax.faces.PROJECT_STAGE</param-name>
-    <!--<param-value>Development</param-value>-->
-    <param-value>Production</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>com.sun.faces.validateXml</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-<!-- enable for websockets -->
-  <context-param>
-    <param-name>javax.faces.ENABLE_WEBSOCKET_ENDPOINT</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-   <!-- disable error handling from myfaces, needed for the demo -->
-  <context-param>
-    <param-name>org.apache.myfaces.ERROR_HANDLING</param-name>
-    <param-value>false</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
-    <param-value>*.xhtml</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
-    <param-value>20</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.apache.myfaces.NUMBER_OF_SEQUENTIAL_VIEWS_IN_SESSION</param-name>
-    <param-value>4</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>org.apache.myfaces.tobago.example.demo.info.ActivitySessionListener</listener-class>
-  </listener>
-
-  <!-- activate this for some containers -->
-  <!--
-  <listener>
-    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  </listener>
-  -->
-
-  <!-- activate this for some containers -->
-  <listener>
-    <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
-  </listener>
-
-  <filter>
-    <filter-name>LoggingMdcFilter</filter-name>
-    <filter-class>org.apache.myfaces.tobago.internal.webapp.LoggingMdcFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>LoggingMdcFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <!-- Error handling, see also these classes:
-       org.apache.myfaces.tobago.example.demo.TobagoExceptionHandler
-   -->
-
-  <error-page>
-    <error-code>404</error-code>
-    <location>/error/404.xhtml</location>
-  </error-page>
-
-  <error-page>
-    <error-code>500</error-code>
-    <location>/error/exception.xhtml</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>java.lang.Exception</exception-type>
-    <location>/error/exception.xhtml</location>
-  </error-page>
-
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>init.xhtml</welcome-file>
-  </welcome-file-list>
-
-  <session-config>
-    <!-- for WebSphere you need to comment out this block, because WebSphere want to set it himself -->
-    <cookie-config>
-      <http-only>true</http-only>
-      <!-- with secure=true you can only use https, not http -->
-      <!--<secure>true</secure>-->
-    </cookie-config>
-  </session-config>
-
-  <security-constraint>
-    <display-name>Security Constraint</display-name>
-    <web-resource-collection>
-      <web-resource-name>Application Area</web-resource-name>
-      <url-pattern>/content/30-concept/80-security/20-roles/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>demo-admin</role-name>
-      <role-name>demo-guest</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>FORM</auth-method>
-    <realm-name>demo-realm</realm-name>
-    <form-login-config>
-      <form-login-page>/login.xhtml</form-login-page>
-      <form-error-page>/login.xhtml</form-error-page>
-    </form-login-config>
-  </login-config>
-
-  <security-role>
-    <role-name>demo-admin</role-name>
-  </security-role>
-  <security-role>
-    <role-name>demo-guest</role-name>
-  </security-role>
-
-</web-app>