diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a8a0cf4ea..c8e56320d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -37,6 +37,12 @@ jobs:
           cache: 'maven'
       - 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
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: quickfix-j/quickfixj
 
   test-windows:
     runs-on: ${{ matrix.os }}
diff --git a/README.md b/README.md
index c7c7cdfbb..245c236aa 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@ QuickFIX/J
 [![Java CI](https://github.com/quickfix-j/quickfixj/actions/workflows/maven.yml/badge.svg)](https://github.com/quickfix-j/quickfixj/actions/workflows/maven.yml)
 [![CodeQL](https://github.com/quickfix-j/quickfixj/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/quickfix-j/quickfixj/actions/workflows/codeql-analysis.yml)
 [![Sonatype Central](https://maven-badges.sml.io/sonatype-central/org.quickfixj/quickfixj-core/badge.svg)](https://maven-badges.sml.io/sonatype-central/org.quickfixj/quickfixj-core)
+[![codecov](https://codecov.io/gh/quickfix-j/quickfixj/graph/badge.svg?token=svUBx8TTzQ)](https://codecov.io/gh/quickfix-j/quickfixj)
 
 This is the official QuickFIX/J project repository.
 
diff --git a/pom.xml b/pom.xml
index d22bcb205..f5463f23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,8 @@
 		<maven-compiler-plugin-version>3.15.0</maven-compiler-plugin-version>
 		<maven-jar-plugin-version>3.5.0</maven-jar-plugin-version>
 		<maven-surefire-plugin-version>3.5.6</maven-surefire-plugin-version>
+		<jacoco-maven-plugin-version>0.8.15</jacoco-maven-plugin-version>
+		<argLine></argLine>
 		<maven-pmd-plugin-version>3.28.0</maven-pmd-plugin-version>
 		<maven-source-plugin-version>3.4.0</maven-source-plugin-version>
 		<maven-javadoc-plugin-version>3.12.0</maven-javadoc-plugin-version>
@@ -236,6 +238,9 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>${maven-surefire-plugin-version}</version>
+					<configuration>
+						<argLine>@{argLine} -Dfile.encoding=${project.build.sourceEncoding}</argLine>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -448,7 +453,32 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+			<plugin>
+			<groupId>org.jacoco</groupId>
+			<artifactId>jacoco-maven-plugin</artifactId>
+			<version>${jacoco-maven-plugin-version}</version>
+			<executions>
+				<execution>
+					<id>jacoco-initialize</id>
+					<goals>
+						<goal>prepare-agent</goal>
+					</goals>
+				</execution>
+				<execution>
+					<id>jacoco-site</id>
+					<phase>package</phase>
+					<goals>
+						<goal>report</goal>
+					</goals>
+					<configuration>
+						<excludes>
+							<exclude>quickfixj-messages/quickfixj-messages-*/target/classes/**</exclude>
+						</excludes>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
+	</plugins>
 	</build>
 	<profiles>
 		<profile>