diff --git a/.github/workflows/build-all-and-publish.yml b/.github/workflows/build-all-and-publish.yml
index f58f39f..de5c70f 100644
--- a/.github/workflows/build-all-and-publish.yml
+++ b/.github/workflows/build-all-and-publish.yml
@@ -96,7 +96,6 @@ jobs:
           path: target/classes/net/jpountz/util/linux/*/liblz4-java.so
           if-no-files-found: error
 
-
   macos:
     name: macOS natives (${{ matrix.os }} - ${{ matrix.arch }})
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4857608..5119631 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,28 +7,51 @@ on:
 jobs:
   linux:
     name: Linux test
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runs-on: ubuntu-24.04
+          - runs-on: ubuntu-24.04-arm
+            # Azul Zulu 7 not available on Aarch64
+            maven-flags: >-
+              -Dmaven.compiler.source=8
+              -Dmaven.compiler.target=8
+          - runs-on: ubuntu-24.04-riscv
+            # Disable fuzzing until https://github.com/CodeIntelligenceTesting/jazzer supports linux-riscv64
+            maven-flags: >-
+              -Dtest='!net/jpountz/fuzz/*'
+              -Dmaven.compiler.source=8
+              -Dmaven.compiler.target=8
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
           submodules: true
           fetch-depth: 0
-      - name: Install Zulu JDK 7
+      - name: Setup Zulu JDK 7
+        if: matrix.runs-on == 'ubuntu-24.04'
         uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: '7'
-          cache: maven
       - name: Setup Temurin JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: '21'
           cache: maven
-      - name: Build (mvn verify on native linux/amd64)
+      - name: Build (mvn verify)
         run: |
-          ./mvnw -B -V \
-            -Darch.id=amd64 \
+          if [ $(uname -m) = "x86_64" ]; then
+            arch_id=amd64
+          else
+            arch_id=$(uname -m)
+          fi
+          ./mvnw -B -ntp -V \
+            -Darch.id=${arch_id} \
             -Dnative.cc=gcc \
+            -Dsurefire.reportFormat=plain \
+            ${{ matrix.maven-flags }} \
             verify
diff --git a/pom.xml b/pom.xml
index d54d87d..44ee2e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,10 @@
     <bnd.maven.plugin.version>7.1.0</bnd.maven.plugin.version>
     <packages.version>${project.version}</packages.version>
     <ivy.version>${project.version}</ivy.version>
+
+    <!-- javac compiler source and target -->
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -183,8 +187,6 @@
               <goal>compile</goal>
             </goals>
             <configuration>
-              <source>1.7</source>
-              <target>1.7</target>
               <encoding>${project.build.sourceEncoding}</encoding>
               <debug>true</debug>
               <fork>true</fork>