diff --git a/pmb/core/arch.py b/pmb/core/arch.py
index 6242a784..195c488b 100644
--- a/pmb/core/arch.py
+++ b/pmb/core/arch.py
@@ -87,6 +87,7 @@ class Arch(enum.Enum):
             Arch.x86_64,
             Arch.x86,
             Arch.riscv64,
+            Arch.s390x,
             Arch.ppc64le,
             Arch.native(),
         }
diff --git a/test/core/test_arch.py b/test/core/test_arch.py
index f97e6868..4a48b30b 100644
--- a/test/core/test_arch.py
+++ b/test/core/test_arch.py
@@ -32,6 +32,7 @@ def test_valid_arches():
     assert Arch.armv7 in Arch.supported()
     assert Arch.riscv64 in Arch.supported()
     assert Arch.ppc64le in Arch.supported()
+    assert Arch.s390x in Arch.supported()
 
     # kernel arch
     assert Arch.x86.kernel() == "x86"
diff --git a/test/core/test_chroot.py b/test/core/test_chroot.py
index 93d66c8e..db9cd02d 100644
--- a/test/core/test_chroot.py
+++ b/test/core/test_chroot.py
@@ -47,7 +47,7 @@ def test_invalid_chroots(pmb_args):
         Chroot(ChrootType.BUILDROOT, "BAD_ARCH")
     assert (
         str(excinfo.value)
-        == "Invalid architecture: 'BAD_ARCH', expected something like: aarch64, armhf, armv7, ppc64le, riscv64, x86, x86_64"
+        == "Invalid architecture: 'BAD_ARCH', expected something like: aarch64, armhf, armv7, ppc64le, riscv64, s390x, x86, x86_64"
     )
 
     with pytest.raises(ValueError) as excinfo: