diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c8e56320d..264b4253a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Test with Maven
         run: ./mvnw install -B -V -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="${{github.workspace}}/quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
       - name: Upload coverage reports to Codecov
-        if: matrix.os == 'ubuntu-latest' && matrix.java == 21
+        if: matrix.os == 'ubuntu-latest' && matrix.java == 21 && github.repository == 'quickfix-j/quickfixj'
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/pom.xml b/pom.xml
index f5463f23e..d633c7ecc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,11 +470,6 @@
 					<goals>
 						<goal>report</goal>
 					</goals>
-					<configuration>
-						<excludes>
-							<exclude>quickfixj-messages/quickfixj-messages-*/target/classes/**</exclude>
-						</excludes>
-					</configuration>
 				</execution>
 			</executions>
 		</plugin>
diff --git a/quickfixj-core/pom.xml b/quickfixj-core/pom.xml
index 0d658f0c0..6ed23f0e6 100644
--- a/quickfixj-core/pom.xml
+++ b/quickfixj-core/pom.xml
@@ -285,7 +285,7 @@
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>
-								-Xmx2g -Djava.net.preferIPv4Stack=true
+								@{argLine} -Xmx2g -Djava.net.preferIPv4Stack=true
 							</argLine>
 							<trimStackTrace>false</trimStackTrace>
 							<includes>
@@ -321,7 +321,7 @@
 						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>
-								-Xmx2g -Djava.net.preferIPv4Stack=true
+								@{argLine} -Xmx2g -Djava.net.preferIPv4Stack=true
 								--add-opens java.base/java.lang=ALL-UNNAMED
 							</argLine>
 							<trimStackTrace>false</trimStackTrace>
diff --git a/quickfixj-messages/pom.xml b/quickfixj-messages/pom.xml
index 3444deec7..b89989767 100644
--- a/quickfixj-messages/pom.xml
+++ b/quickfixj-messages/pom.xml
@@ -18,6 +18,18 @@
 		<generator.decimal>false</generator.decimal>
 	</properties>
 
+	<build>
+		<plugins>
+			<!-- Message classes are generated code; exclude them from JaCoCo coverage entirely. -->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<modules>
 		<!-- The order in which these modules is run is significant