diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/invoker.properties b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/invoker.properties
deleted file mode 100644
index 0e3d716a9..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/invoker.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# The expected result of the build, possible values are "success" (default) and "failure"
-# can be indexed
-invoker.buildResult = failure
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/pom.xml
deleted file mode 100644
index c87691cea..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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>kernel-install-feature-tests</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>install-features-versionless-bad-platform-server-it</artifactId>
-    <packaging>jar</packaging>
-
-        <build>
-        <plugins>
-            <plugin>
-                <groupId>io.openliberty.tools</groupId>
-                <artifactId>liberty-maven-plugin</artifactId>
-                <version>@pom.version@</version>
-                <configuration>
-                    <assemblyArtifact>
-                        <groupId>${runtimeGroupId}</groupId>
-                        <artifactId>${runtimeKernelId}</artifactId>
-                        <version>${runtimeVersion}</version>
-                        <type>zip</type>
-                    </assemblyArtifact>
-                    <serverName>test</serverName>
-                    <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-liberty-server</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>install-server</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>create-server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>create</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>install-server-features</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>install-feature</goal>
-                        </goals>
-                        <configuration>
-                            <features>
-                                <acceptLicense>true</acceptLicense>
-                            </features>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessBadPlatformServerTest.java b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessBadPlatformServerTest.java
deleted file mode 100644
index 0c5d4b23d..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessBadPlatformServerTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * (c) Copyright IBM Corporation 2024.
- *
- * Licensed 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.
- *******************************************************************************/
-package net.wasdev.wlp.test.feature.it;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import java.io.File;
-
-public class InstallFeaturesVersionlessBadPlatformServerTest extends BaseInstallFeature {
-
-    @Test
-    public void testInstalledFeatures() throws Exception {
-        
-
-        assertInstalled("appSecurityClient-1.0");
-        assertNotInstalled("servlet");
-        assertNotInstalled("servlet-4.0");
-        assertNotInstalled("beanValidation-2.0");
-        assertNotInstalled("couchdb-1.0");
-        assertNotInstalled("distributedMap-1.0");
-        
-        assertTrue(buildLogCheck("CWWKF1515E: The badname platform could not be found."));
-    }
-
-}
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/resources/server.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/resources/server.xml
deleted file mode 100644
index 748d9dc27..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-bad-platform-server-it/src/test/resources/server.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<server description="default server">
-    <featureManager>    
-        <feature>appSecurityClient-1.0</feature>
-        <feature>servlet</feature>
-        <platform>badname</platform>
-    </featureManager>     
-</server>
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/invoker.properties b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/invoker.properties
deleted file mode 100644
index 0e3d716a9..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/invoker.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# The expected result of the build, possible values are "success" (default) and "failure"
-# can be indexed
-invoker.buildResult = failure
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/pom.xml
deleted file mode 100644
index 544c296cb..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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>kernel-install-feature-tests</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>install-features-versionless-no-platform-server-it</artifactId>
-    <packaging>jar</packaging>
-
-        <build>
-        <plugins>
-            <plugin>
-                <groupId>io.openliberty.tools</groupId>
-                <artifactId>liberty-maven-plugin</artifactId>
-                <version>@pom.version@</version>
-                <configuration>
-                    <assemblyArtifact>
-                        <groupId>${runtimeGroupId}</groupId>
-                        <artifactId>${runtimeKernelId}</artifactId>
-                        <version>${runtimeVersion}</version>
-                        <type>zip</type>
-                    </assemblyArtifact>
-                    <serverName>test</serverName>
-                    <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-liberty-server</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>install-server</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>create-server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>create</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>install-server-features</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>install-feature</goal>
-                        </goals>
-                        <configuration>
-                            <features>
-                                <acceptLicense>true</acceptLicense>
-                            </features>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessNoPlatformServerTest.java b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessNoPlatformServerTest.java
deleted file mode 100644
index 17585fa83..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessNoPlatformServerTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * (c) Copyright IBM Corporation 2024.
- *
- * Licensed 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.
- *******************************************************************************/
-package net.wasdev.wlp.test.feature.it;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import java.io.File;
-
-public class InstallFeaturesVersionlessNoPlatformServerTest extends BaseInstallFeature {
-
-    @Test
-    public void testInstalledFeatures() throws Exception {
-        
-
-        assertInstalled("appSecurityClient-1.0");
-        assertNotInstalled("servlet");
-        assertNotInstalled("servlet-4.0");
-        assertNotInstalled("beanValidation-2.0");
-        assertNotInstalled("couchdb-1.0");
-        assertNotInstalled("distributedMap-1.0");
-        
-        assertTrue(buildLogCheck("CWWKF1516E: The platform could not be determined. The following versionless features cannot be installed: [servlet]"));
-    }
-
-}
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/resources/server.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/resources/server.xml
deleted file mode 100644
index 9bbdc46d5..000000000
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/install-features-versionless-no-platform-server-it/src/test/resources/server.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<server description="default server">
-    <featureManager>    
-        <feature>appSecurityClient-1.0</feature>
-        <feature>servlet</feature>
-    </featureManager>     
-</server>
diff --git a/liberty-maven-plugin/src/it/kernel-install-feature-test/pom.xml b/liberty-maven-plugin/src/it/kernel-install-feature-test/pom.xml
index 6821117f3..b3049e30a 100755
--- a/liberty-maven-plugin/src/it/kernel-install-feature-test/pom.xml
+++ b/liberty-maven-plugin/src/it/kernel-install-feature-test/pom.xml
@@ -37,6 +37,8 @@
         <module>install-features-pluginlist-it</module>
         <module>install-features-server-already-installed-lowercase-it</module>
         <module>install-features-server-it</module>
+        <module>install-features-versionless-server-it</module>
+        <module>install-features-versionless-with-versioned-server-it</module>
         <module>install-ol-features-no-accept-license-it</module> 
         <module>prepare-feature-it</module>
 		<module>prepare-multiple-features-it</module>