diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
index 1808651d4..312366b2c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java
@@ -30,7 +30,7 @@
 public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase {
 
     public MavenITmng7038RootdirTest() {
-        super("[4.0.0-alpha-6,)");
+        super("[3.10.0,)");
     }
 
     @Test
@@ -58,42 +58,8 @@ public void testRootdir() throws IOException, VerificationException {
                 Boolean.TRUE.toString(),
                 props.getProperty("project.properties.activated"));
 
-        verifier.verifyFilePresent("module-a/target/pom.properties");
-        props = verifier.loadProperties("module-a/target/pom.properties");
-        assertEquals(
-                "project.properties.rootdir",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.properties.rootdir"));
-        assertEquals(
-                "project.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.rootDirectory"));
-        assertEquals("session.topDirectory", testDir.getAbsolutePath(), props.getProperty("session.topDirectory"));
-        assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
-        assertEquals(
-                "project.properties.activated",
-                Boolean.FALSE.toString(),
-                props.getProperty("project.properties.activated"));
-
-        verifier.verifyFilePresent("module-a/module-a-1/target/pom.properties");
-        props = verifier.loadProperties("module-a/module-a-1/target/pom.properties");
-        assertEquals(
-                "project.properties.rootdir",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.properties.rootdir"));
-        assertEquals(
-                "project.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.rootDirectory"));
-        assertEquals("session.topDirectory", testDir.getAbsolutePath(), props.getProperty("session.topDirectory"));
-        assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
-        assertEquals(
-                "project.properties.activated",
-                Boolean.FALSE.toString(),
-                props.getProperty("project.properties.activated"));
-
-        verifier.verifyFilePresent("module-b/target/pom.properties");
-        props = verifier.loadProperties("module-b/target/pom.properties");
+        verifier.verifyFilePresent("module/target/pom.properties");
+        props = verifier.loadProperties("module/target/pom.properties");
         assertEquals(
                 "project.properties.rootdir",
                 testDir.getAbsolutePath(),
@@ -106,8 +72,8 @@ public void testRootdir() throws IOException, VerificationException {
                 Boolean.TRUE.toString(),
                 props.getProperty("project.properties.activated"));
 
-        verifier.verifyFilePresent("module-b/module-b-1/target/pom.properties");
-        props = verifier.loadProperties("module-b/module-b-1/target/pom.properties");
+        verifier.verifyFilePresent("module/module-1/target/pom.properties");
+        props = verifier.loadProperties("module/module-1/target/pom.properties");
         assertEquals(
                 "project.properties.rootdir",
                 testDir.getAbsolutePath(),
@@ -122,67 +88,9 @@ public void testRootdir() throws IOException, VerificationException {
     }
 
     @Test
-    public void testRootdirWithTopdirAndRoot() throws IOException, VerificationException {
-        File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7038-rootdir");
-        Verifier verifier = newVerifier(new File(testDir, "module-a").getAbsolutePath());
-
-        verifier.addCliArgument("validate");
-        verifier.execute();
-        verifier.verifyErrorFreeLog();
-
-        Properties props;
-
-        verifier.verifyFilePresent("target/pom.properties");
-        props = verifier.loadProperties("target/pom.properties");
-        assertEquals(
-                "project.properties.rootdir",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.properties.rootdir"));
-        assertEquals(
-                "project.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.rootDirectory"));
-        assertEquals(
-                "session.topDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("session.topDirectory"));
-        assertEquals(
-                "session.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("session.rootDirectory"));
-        assertEquals(
-                "project.properties.activated",
-                Boolean.FALSE.toString(),
-                props.getProperty("project.properties.activated"));
-
-        verifier.verifyFilePresent("module-a-1/target/pom.properties");
-        props = verifier.loadProperties("module-a-1/target/pom.properties");
-        assertEquals(
-                "project.properties.rootdir",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.properties.rootdir"));
-        assertEquals(
-                "project.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("project.rootDirectory"));
-        assertEquals(
-                "session.topDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("session.topDirectory"));
-        assertEquals(
-                "session.rootDirectory",
-                new File(testDir, "module-a").getAbsolutePath(),
-                props.getProperty("session.rootDirectory"));
-        assertEquals(
-                "project.properties.activated",
-                Boolean.FALSE.toString(),
-                props.getProperty("project.properties.activated"));
-    }
-
-    @Test
-    public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationException {
+    public void testRootdirWithTopdir() throws IOException, VerificationException {
         File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7038-rootdir");
-        Verifier verifier = newVerifier(new File(testDir, "module-b").getAbsolutePath());
+        Verifier verifier = newVerifier(new File(testDir, "module").getAbsolutePath());
 
         verifier.addCliArgument("validate");
         verifier.execute();
@@ -199,7 +107,7 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc
         assertEquals("project.rootDirectory", testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"));
         assertEquals(
                 "session.topDirectory",
-                new File(testDir, "module-b").getAbsolutePath(),
+                new File(testDir, "module").getAbsolutePath(),
                 props.getProperty("session.topDirectory"));
         assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
         assertEquals(
@@ -207,8 +115,8 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc
                 Boolean.TRUE.toString(),
                 props.getProperty("project.properties.activated"));
 
-        verifier.verifyFilePresent("module-b-1/target/pom.properties");
-        props = verifier.loadProperties("module-b-1/target/pom.properties");
+        verifier.verifyFilePresent("module-1/target/pom.properties");
+        props = verifier.loadProperties("module-1/target/pom.properties");
         assertEquals(
                 "project.properties.rootdir",
                 testDir.getAbsolutePath(),
@@ -216,7 +124,7 @@ public void testRootdirWithTopdirAndNoRoot() throws IOException, VerificationExc
         assertEquals("project.rootDirectory", testDir.getAbsolutePath(), props.getProperty("project.rootDirectory"));
         assertEquals(
                 "session.topDirectory",
-                new File(testDir, "module-b").getAbsolutePath(),
+                new File(testDir, "module").getAbsolutePath(),
                 props.getProperty("session.topDirectory"));
         assertEquals("session.rootDirectory", testDir.getAbsolutePath(), props.getProperty("session.rootDirectory"));
         assertEquals(
diff --git a/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml b/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml
deleted file mode 100644
index 6ca592c68..000000000
--- a/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/pom.xml
+++ /dev/null
@@ -1,36 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7038</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>module-a</artifactId>
-
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>module-a-1</module>
-  </modules>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7038-rootdir/module-b/module-b-1/pom.xml b/core-it-suite/src/test/resources/mng-7038-rootdir/module-b/module-b-1/pom.xml
deleted file mode 100644
index 15213284c..000000000
--- a/core-it-suite/src/test/resources/mng-7038-rootdir/module-b/module-b-1/pom.xml
+++ /dev/null
@@ -1,32 +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.
--->
-<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>org.apache.maven.its.mng7038</groupId>
-    <artifactId>module-b</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>module-b-1</artifactId>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/module-a-1/pom.xml b/core-it-suite/src/test/resources/mng-7038-rootdir/module/module-1/pom.xml
similarity index 93%
rename from core-it-suite/src/test/resources/mng-7038-rootdir/module-a/module-a-1/pom.xml
rename to core-it-suite/src/test/resources/mng-7038-rootdir/module/module-1/pom.xml
index 7b63da855..03b621ba4 100644
--- a/core-it-suite/src/test/resources/mng-7038-rootdir/module-a/module-a-1/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7038-rootdir/module/module-1/pom.xml
@@ -23,10 +23,10 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven.its.mng7038</groupId>
-    <artifactId>module-a</artifactId>
+    <artifactId>module</artifactId>
     <version>1.0</version>
   </parent>
 
-  <artifactId>module-a-1</artifactId>
+  <artifactId>module-1</artifactId>
 
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7038-rootdir/module-b/pom.xml b/core-it-suite/src/test/resources/mng-7038-rootdir/module/pom.xml
similarity index 94%
rename from core-it-suite/src/test/resources/mng-7038-rootdir/module-b/pom.xml
rename to core-it-suite/src/test/resources/mng-7038-rootdir/module/pom.xml
index f657609ec..7c6a7009c 100644
--- a/core-it-suite/src/test/resources/mng-7038-rootdir/module-b/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7038-rootdir/module/pom.xml
@@ -27,12 +27,12 @@ under the License.
     <version>1.0</version>
   </parent>
 
-  <artifactId>module-b</artifactId>
+  <artifactId>module</artifactId>
 
   <packaging>pom</packaging>
 
   <modules>
-    <module>module-b-1</module>
+    <module>module-1</module>
   </modules>
 
 </project>
diff --git a/core-it-suite/src/test/resources/mng-7038-rootdir/pom.xml b/core-it-suite/src/test/resources/mng-7038-rootdir/pom.xml
index 422898949..13e9287bf 100644
--- a/core-it-suite/src/test/resources/mng-7038-rootdir/pom.xml
+++ b/core-it-suite/src/test/resources/mng-7038-rootdir/pom.xml
@@ -30,8 +30,7 @@ under the License.
   <description>Test project.rootDirectory, session.topDirectory and session.rootDirectory properties.</description>
 
   <modules>
-    <module>module-a</module>
-    <module>module-b</module>
+    <module>module</module>
   </modules>
 
   <properties>
@@ -39,6 +38,7 @@ under the License.
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <rootdir>${project.rootDirectory}</rootdir>
+    <bsedir>${project.basedir}</bsedir>
     <activated>false</activated>
   </properties>
 
@@ -74,7 +74,7 @@ under the License.
       <id>rootdir-profile-activation</id>
       <activation>
         <file>
-          <exists>${rootDirectory}/.mvn/.gitkeep</exists>
+          <exists>${project.rootDirectory}/.mvn/.gitkeep</exists>
         </file>
       </activation>
       <properties>