diff --git a/packages/z/zlib-ng/xmake.lua b/packages/z/zlib-ng/xmake.lua
index 1d5d917ea..948767a9f 100644
--- a/packages/z/zlib-ng/xmake.lua
+++ b/packages/z/zlib-ng/xmake.lua
@@ -1,17 +1,37 @@
 package("zlib-ng")
-
     set_homepage("https://github.com/zlib-ng/zlib-ng")
     set_description("zlib replacement with optimizations for next generation systems.")
     set_license("zlib")
 
     add_urls("https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$(version).tar.gz",
              "https://github.com/zlib-ng/zlib-ng.git")
-    add_versions("2.0.5", "eca3fe72aea7036c31d00ca120493923c4d5b99fe02e6d3322f7c88dbdcd0085")
-    add_versions("2.0.6", "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6")
+
+    add_versions("2.1.6", "a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2")
     add_versions("2.1.5", "3f6576971397b379d4205ae5451ff5a68edf6c103b2f03c4188ed7075fbb5f04")
+    add_versions("2.0.6", "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6")
+    add_versions("2.0.5", "eca3fe72aea7036c31d00ca120493923c4d5b99fe02e6d3322f7c88dbdcd0085")
 
     add_deps("cmake")
 
+    if on_check then
+        on_check("windows", "mingw", function (package)
+            import("core.tool.toolchain")
+            import("core.base.semver")
+
+            if package:version():ge("2.1.5") and package:is_arch("arm.*") then
+                local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()})
+                if msvc then
+                    local vs_sdkver = msvc:config("vs_sdkver")
+                    assert(vs_sdkver and semver.match(vs_sdkver):gt("10.0.19041"), "package(zlib-ng/arm >= 2.1.5): need vs_sdkver > 10.0.19041.0")
+                end
+            end
+
+            if package:version():eq("2.1.6") and package:is_arch("i386") and package:is_cross() then
+                assert(false, "package(zlib-ng/i386): Unsupported cross compilation")
+            end
+        end)
+    end
+
     on_load(function (package)
         if package:version():eq("2.1.5") then
             if package:is_plat("android") or package:is_arch("arm.*") then
@@ -21,7 +41,12 @@ package("zlib-ng")
     end)
 
     on_install("windows", "macosx", "linux", "android", "mingw", function (package)
-        local configs = {"-DZLIB_COMPAT=ON"}
+        local configs = {
+            "-DZLIB_COMPAT=ON",
+            "-DZLIB_ENABLE_TESTS=OFF",
+            "-DZLIBNG_ENABLE_TESTS=OFF",
+            "-DWITH_GTEST=OFF",
+        }
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DINC_INSTALL_DIR=" .. package:installdir("include"))