diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 48bc3b749..1ed8bc033 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,7 +17,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, windows-11-arm]
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+          - ubuntu-24.04-arm
+          - windows-11-arm
         version: [11, 17, 21]
         exclude:
         - os: windows-11-arm
diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml
new file mode 100644
index 000000000..2055260cc
--- /dev/null
+++ b/.github/workflows/ibm-ci.yaml
@@ -0,0 +1,59 @@
+name: IBM CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+# on:
+#   schedule:
+#    - cron: "0 0 * * *" # everyday
+
+permissions:
+  contents: read
+  checks: write
+
+jobs:
+  ibm-ci:
+    name: IBM CI
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        # Thanks to: https://github.com/IBM/actionspz
+        os: [ubuntu-24.04-ppc64le, ubuntu-24.04-s390x]
+        include:
+          - os: ubuntu-24.04-ppc64le
+            arch: ppc64le
+          - os: ubuntu-24.04-s390x
+            arch: s390x
+        version: [11, 17, 21]
+        jvm: [temurin, semeru]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v5
+      - name: Checkout testsuite
+        uses: actions/checkout@v5
+        with:
+          repository: WebAssembly/testsuite
+          path: testsuite
+          # The ref needs to stay in sync with the default value in test-gen-plugin
+          ref: 88e97b0f742f4c3ee01fea683da130f344dd7b02
+      - name: Checkout wasi-testsuite
+        uses: actions/checkout@v5
+        with:
+          repository: WebAssembly/wasi-testsuite
+          path: wasi-testsuite
+          ref: prod/testsuite-base
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: '${{ matrix.jvm }}'
+          java-version: '${{ matrix.version }}'
+          architecture: '${{ matrix.arch }}'
+          cache: maven
+      - name: Test Java and Check Style
+        run: mvn -B clean install
+        env:
+          MAVEN_OPTS: "-ea"
diff --git a/pom.xml b/pom.xml
index cf58aded9..684f96696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
     <google-compile-testing.version>0.21.0</google-compile-testing.version>
     <wagon-maven-plugin.version>2.0.2</wagon-maven-plugin.version>
     <zerofs.version>0.1.0</zerofs.version>
+    <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
   </properties>
 
   <dependencyManagement>
diff --git a/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java b/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java
index 0eea22b2f..7ff316ad5 100644
--- a/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java
+++ b/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.dylibso.chicory.runtime.ByteArrayMemory;
 import com.dylibso.chicory.runtime.Instance;
 import com.dylibso.chicory.wasm.Parser;
 import org.junit.jupiter.api.Test;
@@ -17,6 +18,7 @@ public void shouldRunBasicExample() {
                                         BasicSimdTest.class.getResourceAsStream(
                                                 "/compiled/simd-example.wat.wasm")))
                         .withMachineFactory(SimdInterpreterMachine::new)
+                        .withMemoryFactory(ByteArrayMemory::new)
                         .build();
         var main = instance.export("main");
         var result = main.apply()[0];
diff --git a/wasm-tools/pom.xml b/wasm-tools/pom.xml
index ef667aad0..cbab18336 100644
--- a/wasm-tools/pom.xml
+++ b/wasm-tools/pom.xml
@@ -71,7 +71,9 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>${maven-antrun-plugin.version}</version>
         <executions>
           <execution>
             <goals>