diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6fd6f5e..44b63a1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,13 +8,11 @@ on:
     branches:
       - trunk
 
-env:
-  MOD_NAME: community-maps-2
-
 jobs:
-  test:
+  test-community-maps-2:
     runs-on: ubuntu-latest
     env:
+      MOD_NAME: community-maps-2
       MOD_VERSION: ${{ github.sha }}
     steps:
     - uses: actions/checkout@v3
@@ -29,14 +27,25 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - uses: 0ad-matters/gh-action-build-pyromod@trunk
+    - name: Use action from self
+      uses: ./
+      with:
+        name: ${{ env.MOD_NAME }}
+        version: ${{ env.MOD_VERSION }}
+        directory: 'test/${{ env.MOD_NAME }}'
+
+  test-xiiiad:
+    runs-on: ubuntu-latest
+    env:
+      MOD_NAME: xiiiad
+      MOD_VERSION: ${{ github.sha }}
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: Use action from self
+      uses: ./
       with:
         name: ${{ env.MOD_NAME }}
         version: ${{ env.MOD_VERSION }}
         directory: 'test/${{ env.MOD_NAME }}'
-    #- name: Upload Artifacts
-      ## Uploads artifacts (combined into a zip file) to the workflow output page
-      #uses: actions/upload-artifact@v3
-      #with:
-        #name: ${{ env.MOD_NAME }}-${{ env.MOD_VERSION }}
-        #path: "output/${{ env.MOD_NAME }}*.*"
diff --git a/.gitmodules b/.gitmodules
index bd043be..cf821ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "test/community-maps-2"]
 	path = test/community-maps-2
 	url = https://github.com/0ad-matters/community-maps-2
+[submodule "test/xiiiad"]
+	path = test/xiiiad
+	url = https://github.com/0ADMods/xiiiad
diff --git a/entrypoint.sh b/entrypoint.sh
index e38c59c..02c748f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,9 +14,7 @@ su user0ad --command "/home/user0ad/usr/bin/pyrogenesis  \
     -mod=package_mod   \
     -archivebuild=$INPUT_DIRECTORY  \
     -archivebuild-output=$OUTPUT_FILE    \
-    -archivebuild-compress"
+    -archivebuild-compress" \
+    && test -f "$OUTPUT_FILE"
 
-test -f "$OUTPUT_FILE"
 zip -d "$OUTPUT_FILE" ".git*"
-
-
diff --git a/test/xiiiad b/test/xiiiad
new file mode 160000
index 0000000..f7f537a
--- /dev/null
+++ b/test/xiiiad
@@ -0,0 +1 @@
+Subproject commit f7f537a861de322855ef104628f1d6cd8eb8eb61