diff --git a/.github/workflows/CI-unix.yml b/.github/workflows/CI-unix.yml
index d0d2d46e..feef54e3 100644
--- a/.github/workflows/CI-unix.yml
+++ b/.github/workflows/CI-unix.yml
@@ -104,13 +104,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install QEMU
         # this ensure install latest qemu on ubuntu, apt get version is old
-        env:
-          QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu"
-          QEMU_VER: "qemu-user-static_4\\.2-.*_amd64.deb$"
         run: |
-          DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1`
-          wget $QEMU_SRC/$DEB
-          sudo dpkg -i $DEB
+          wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user-static_7.0+dfsg-7ubuntu1_amd64.deb
+          sudo dpkg -i qemu-user-static_7.0+dfsg-7ubuntu1_amd64.deb
       - name: Install ${{ matrix.config.toolchain }}
         run: |
           sudo apt update
diff --git a/test/test-fs.c b/test/test-fs.c
index c879f629..13d7b448 100644
--- a/test/test-fs.c
+++ b/test/test-fs.c
@@ -1393,6 +1393,13 @@ TEST_IMPL(fs_fstat) {
   struct stat t;
 #endif
 
+#if defined(__s390__) && defined(__QEMU__)
+  /* qemu-user-s390x has this weird bug where statx() reports nanoseconds
+   * but plain fstat() does not.
+   */
+  RETURN_SKIP("Test does not currently work in QEMU");
+#endif
+
   /* Setup. */
   unlink("test_file");