diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml
index d0dd87b287a9..b47269d4cdc1 100644
--- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml
+++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml
@@ -148,7 +148,7 @@
   </build>
 
   <profiles>
-    <!-- Library cannot build for Java 10 and below -->
+    <!-- Library cannot build for Java 11 and below -->
     <profile>
       <id>java8</id>
       <activation>
diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
index ebb134a17755..f6254274328f 100644
--- a/sdk/parents/azure-client-sdk-parent/pom.xml
+++ b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -975,7 +975,7 @@
             </configuration>
             <executions>
               <!-- compile first with VM's default Java version -->
-              <!-- this will generate module-info with major class version 61 or higher (i.e Java 17 or higher) -->
+              <!-- this will generate module-info with major class version based on the Java version being used, in CI this should be 61 (i.e Java 17) -->
               <execution>
                 <id>default-compile</id>
                 <goals>
@@ -985,6 +985,7 @@
                   <release>${java.vm.specification.version}</release>
                 </configuration>
               </execution>
+
               <!-- then compile with Java 11 as the base version that supports module-info -->
               <!-- this is the Azure SDK baseline for jars that are released to Maven and should only be updated
               when the Azure SDK policy is changed -->
@@ -996,8 +997,12 @@
                 </goals>
                 <configuration>
                   <release>11</release>
+                  <includes>
+                    <include>module-info.java</include>
+                  </includes>
                 </configuration>
               </execution>
+
               <!-- then compile without module-info for Java 8 -->
               <execution>
                 <id>base-compile</id>
@@ -1023,17 +1028,6 @@
                 </configuration>
               </execution>
 
-              <!-- compile tests with Java 11 -->
-              <execution>
-                <id>base-modules-testCompile</id>
-                <goals>
-                  <goal>testCompile</goal>
-                </goals>
-                <configuration>
-                  <testRelease>11</testRelease>
-                </configuration>
-              </execution>
-
               <!-- then compile with Java 8 -->
               <execution>
                 <id>base-testCompile</id>