diff --git a/liberty-maven-plugin-integration-tests/assembly-server/pom.xml b/liberty-maven-plugin-integration-tests/assembly-server/pom.xml
new file mode 100644
index 000000000..109195002
--- /dev/null
+++ b/liberty-maven-plugin-integration-tests/assembly-server/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.openliberty.tools.it</groupId>
+        <artifactId>liberty-maven-plugin-integration-tests</artifactId>
+        <version>3.8.3-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>assembly-server</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <!-- Specify Liberty profile server installation directory -->
+        <liberty.install.dir>${libertyInstallDir}</liberty.install.dir>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.openliberty.tools</groupId>
+                    <artifactId>liberty-maven-plugin</artifactId>
+                    <version>${project.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <!-- install the liberty server zip the local maven repo. This is used 
+                    by the liberty-packaging-test and liberty-packaging-it tests -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-liberty-to-repo</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <configuration>
+                            <file>${basedir}/target/liberty.zip</file>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                            <packaging>zip</packaging>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>offline-its</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <!-- zip up the liberty server to deploy it to the local maven repo 
+                            (next plugin) -->
+                        <!-- I would expect the server is already available as a zip, but I 
+                            can't find it -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <target>
+                                        <zip basedir="${liberty.install.dir}" destfile="${basedir}/target/liberty.zip"
+                                            excludes="usr/servers/**" />
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>online-its</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.openliberty.tools</groupId>
+                        <artifactId>liberty-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>downloading-wlp</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>status</goal>
+                                </goals>
+                                <configuration>
+                                    <assemblyArtifact>
+                                        <groupId>${runtimeGroupId}</groupId>
+                                        <artifactId>${runtimeArtifactId}</artifactId>
+                                        <version>${runtimeVersion}</version>
+                                        <type>zip</type>
+                                    </assemblyArtifact>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>process-resources</phase>
+                                <configuration>
+                                    <target>
+                                        <zip basedir="${basedir}/target/liberty/wlp" destfile="${basedir}/target/liberty.zip" />
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/liberty-maven-plugin/src/it/config-directory-it/pom.xml b/liberty-maven-plugin-integration-tests/config-directory-it/pom.xml
similarity index 91%
rename from liberty-maven-plugin/src/it/config-directory-it/pom.xml
rename to liberty-maven-plugin-integration-tests/config-directory-it/pom.xml
index 1cd537006..ffa8e30b0 100644
--- a/liberty-maven-plugin/src/it/config-directory-it/pom.xml
+++ b/liberty-maven-plugin-integration-tests/config-directory-it/pom.xml
@@ -5,14 +5,26 @@
 
   <parent>
     <groupId>io.openliberty.tools.it</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>liberty-maven-plugin-integration-tests</artifactId>
+    <version>3.8.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>config-directory-it</artifactId>
   <packaging>war</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>io.openliberty.tools</groupId>
+      <artifactId>liberty-maven-plugin</artifactId>
+      <version>${project.version}</version>
+      <type>maven-plugin</type>
+    </dependency>
+    <dependency>
+      <groupId>io.openliberty.tools.it</groupId>
+      <artifactId>assembly-server</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_3.0_spec</artifactId>
@@ -68,8 +80,7 @@
       <plugin>
         <groupId>io.openliberty.tools</groupId>
         <artifactId>liberty-maven-plugin</artifactId>
-        <version>@pom.version@</version>
-        <extensions>true</extensions>
+        <version>${project.version}</version>
         <configuration>
           <stripVersion>true</stripVersion>
           <assemblyArtifact>
@@ -156,7 +167,7 @@
                 <plugin>
                     <groupId>io.openliberty.tools</groupId>
                     <artifactId>liberty-maven-plugin</artifactId>
-                    <version>@pom.version@</version>
+                    <version>${project.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -183,7 +194,7 @@
                 <plugin>
                     <groupId>io.openliberty.tools</groupId>
                     <artifactId>liberty-maven-plugin</artifactId>
-                    <version>@pom.version@</version>
+                  <version>${project.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -205,7 +216,7 @@
                 <plugin>
                     <groupId>io.openliberty.tools</groupId>
                     <artifactId>liberty-maven-plugin</artifactId>
-                    <version>@pom.version@</version>
+                  <version>${project.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/main/webapp/index.jsp b/liberty-maven-plugin-integration-tests/config-directory-it/src/main/webapp/index.jsp
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/main/webapp/index.jsp
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/main/webapp/index.jsp
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/ConfigDirectoryTest.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/ConfigDirectoryTest.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/ConfigDirectoryTest.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/ConfigDirectoryTest.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/KeystorePasswordTest.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/KeystorePasswordTest.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/KeystorePasswordTest.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/KeystorePasswordTest.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/LibertySettingsDirectoryTest.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanAfterTest.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanAfterTest.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanAfterTest.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanAfterTest.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanBeforeTest.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanBeforeTest.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanBeforeTest.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/app/MicroCleanBeforeTest.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/support/HttpUtils.java b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/support/HttpUtils.java
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/support/HttpUtils.java
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/java/net/wasdev/wlp/maven/test/support/HttpUtils.java
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/resources/invalidDirPom.xml b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/invalidDirPom.xml
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/resources/invalidDirPom.xml
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/invalidDirPom.xml
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/resources/server.xml b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/server.xml
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/resources/server.xml
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/server.xml
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testConfig/server1.xml b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testConfig/server1.xml
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testConfig/server1.xml
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testConfig/server1.xml
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testConfig/testDir/bootstrap1.properties b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testConfig/testDir/bootstrap1.properties
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testConfig/testDir/bootstrap1.properties
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testConfig/testDir/bootstrap1.properties
diff --git a/liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testLibertyConfig/repository.properties b/liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testLibertyConfig/repository.properties
similarity index 100%
rename from liberty-maven-plugin/src/it/config-directory-it/src/test/resources/testLibertyConfig/repository.properties
rename to liberty-maven-plugin-integration-tests/config-directory-it/src/test/resources/testLibertyConfig/repository.properties
diff --git a/liberty-maven-plugin-integration-tests/pom.xml b/liberty-maven-plugin-integration-tests/pom.xml
new file mode 100644
index 000000000..00b75e02e
--- /dev/null
+++ b/liberty-maven-plugin-integration-tests/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.openliberty.tools</groupId>
+        <artifactId>liberty-maven</artifactId>
+        <version>3.8.3-SNAPSHOT</version>
+    </parent>
+
+    <groupId>io.openliberty.tools.it</groupId>
+    <artifactId>liberty-maven-plugin-integration-tests</artifactId>
+    <version>3.8.3-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Liberty Maven Plugin :: ITs</name>
+
+    <modules>
+        <module>assembly-server</module>
+        <module>config-directory-it</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <inherited>true</inherited>
+                    <executions>
+                        <execution>
+                            <id>portnumber</id>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>reserve-network-port</goal>
+                            </goals>
+                            <configuration>
+                                <portNames>
+                                    <name>liberty.port</name>
+                                </portNames>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    
+</project>
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index 41d69972f..c324dc689 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -183,6 +183,7 @@
                             </profiles>
                             <streamLogs>true</streamLogs>
                             <mavenOpts>-Dfile.encoding=UTF-8</mavenOpts>
+                            <skipInvocation>${skipPluginIts}</skipInvocation>
                         </configuration>
                         <executions>
                             <execution>
diff --git a/liberty-maven-plugin/src/it/config-directory-it/invoker.properties b/liberty-maven-plugin/src/it/config-directory-it/invoker.properties
deleted file mode 100644
index a12c0ad0a..000000000
--- a/liberty-maven-plugin/src/it/config-directory-it/invoker.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Goal 2 and 3 will run tests verifying a "Before" and "After" state
-# Goal 1 will include remaining tests and execute first
-invoker.goals.1 = clean install -Pmain-it
-invoker.goals.1 = liberty:create verify -Pmicro-clean-before
-invoker.goals.2 = liberty:create integration-test -Pmicro-clean-after
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 729b9eb3b..0045e0935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
     <modules>
         <module>liberty-maven-app-parent</module>
         <module>liberty-maven-plugin</module>
+        <module>liberty-maven-plugin-integration-tests</module>
     </modules>
 
     <build>