diff --git a/tests/xmake.lua b/tests/xmake.lua
index 5ee51bb78..52b887b63 100644
--- a/tests/xmake.lua
+++ b/tests/xmake.lua
@@ -9,6 +9,10 @@ target("NazaraClientUnitTests")
 	set_group("Tests")
 	set_kind("binary")
 
+	if xmake.version():ge("2.5.9") then
+		add_rules("c++.unity_build")
+	end
+
 	add_deps("NazaraAudio", "NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader")
 	add_packages("catch2")
 
@@ -20,6 +24,10 @@ target("NazaraUnitTests")
 	set_group("Tests")
 	set_kind("binary")
 
+	if xmake.version():ge("2.5.9") then
+		add_rules("c++.unity_build")
+	end
+
 	add_deps("NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader")
 	add_packages("catch2")
 
diff --git a/xmake.lua b/xmake.lua
index 09176064c..f2fa79908 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -241,7 +241,11 @@ rule("build_rendererplugins")
 rule("embed_resources")
 	before_build(function (target, opt)
 		import("core.base.option")
-		import("private.utils.progress")
+		if xmake.version():ge("2.5.9") then
+			import("utils.progress")
+		else 
+			import("private.utils.progress")
+		end
 
 		local function GenerateEmbedHeader(filepath, targetpath)
 			local bufferSize = 1024 * 1024