diff --git a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml
index 76a71cff..1e73df22 100644
--- a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml
+++ b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/pom.xml
@@ -1,7 +1,6 @@
-<?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>
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>boost</groupId>
 	<artifactId>test-cdi-2.0</artifactId>
diff --git a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
index 6a62f784..11bfab81 100644
--- a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
+++ b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/main/java/io/openliberty/guides/inventory/client/SystemClient.java
@@ -27,7 +27,9 @@
 public class SystemClient {
 
     // Constants for building URI to the system service.
-    private final int DEFAULT_PORT = Integer.valueOf(System.getProperty("default.http.port"));
+    // private final int DEFAULT_PORT =
+    // Integer.valueOf(System.getProperty("default.http.port"));
+    private final int DEFAULT_PORT = 9000;
     private final String SYSTEM_PROPERTIES = "/system/properties";
     private final String PROTOCOL = "http";
 
diff --git a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointIT.java
similarity index 99%
rename from boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java
rename to boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointIT.java
index dd86315b..1228ceea 100644
--- a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointTest.java
+++ b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/inventory/InventoryEndpointIT.java
@@ -28,7 +28,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class InventoryEndpointTest {
+public class InventoryEndpointIT {
 
     private static String port;
     private static String baseUrl;
@@ -41,7 +41,7 @@ public class InventoryEndpointTest {
     @BeforeClass
     public static void oneTimeSetup() {
         // port = System.getProperty("liberty.test.port");
-        String port = "9080";
+        String port = "9000";
         baseUrl = "http://localhost:" + port + "/";
     }
 
diff --git a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointIT.java
similarity index 96%
rename from boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java
rename to boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointIT.java
index 60e11067..54b689ba 100644
--- a/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointTest.java
+++ b/boost-maven/boost-maven-plugin/src/it/test-cdi-2.0/src/test/java/it/io/openliberty/guides/system/SystemEndpointIT.java
@@ -22,12 +22,12 @@
 import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
 import org.junit.Test;
 
-public class SystemEndpointTest {
+public class SystemEndpointIT {
 
     @Test
     public void testGetProperties() {
         // String port = System.getProperty("liberty.test.port");
-        String port = "9080";
+        String port = "9000";
         String url = "http://localhost:" + port + "/";
 
         Client client = ClientBuilder.newClient();