diff --git a/tests/Nazara/Core/ByteArray.cpp b/tests/Nazara/Core/ByteArray.cpp
index b2b97fe08..54c8754f5 100644
--- a/tests/Nazara/Core/ByteArray.cpp
+++ b/tests/Nazara/Core/ByteArray.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/ByteArray.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 #include <string>
 
diff --git a/tests/Nazara/Core/Clock.cpp b/tests/Nazara/Core/Clock.cpp
index 9f33a002d..140b2cf57 100644
--- a/tests/Nazara/Core/Clock.cpp
+++ b/tests/Nazara/Core/Clock.cpp
@@ -1,7 +1,6 @@
 #include <Nazara/Core/Clock.hpp>
-#include <catch.hpp>
-
-#include <thread>
+#include <Nazara/Core/Thread.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Clock", "[CORE][CLOCK]")
 {
@@ -22,7 +21,7 @@ SCENARIO("Clock", "[CORE][CLOCK]")
 				clock.Unpause();
 				THEN("Time must not be the initialTime")
 				{
-					std::this_thread::sleep_for(std::chrono::microseconds(10));
+					NzThread::Sleep(1);
 					REQUIRE(clock.GetMicroseconds() != initialTime);
 				}
 			}
diff --git a/tests/Nazara/Core/Color.cpp b/tests/Nazara/Core/Color.cpp
index a07610839..36e988613 100644
--- a/tests/Nazara/Core/Color.cpp
+++ b/tests/Nazara/Core/Color.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/Color.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Color", "[CORE][COLOR]")
 {
diff --git a/tests/Nazara/Core/Directory.cpp b/tests/Nazara/Core/Directory.cpp
index 203529bb1..4b152776d 100644
--- a/tests/Nazara/Core/Directory.cpp
+++ b/tests/Nazara/Core/Directory.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/Directory.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Directory", "[CORE][DIRECTORY]")
 {
diff --git a/tests/Nazara/Core/Error.cpp b/tests/Nazara/Core/Error.cpp
index c05e695be..fd1a8fa91 100644
--- a/tests/Nazara/Core/Error.cpp
+++ b/tests/Nazara/Core/Error.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/Error.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Error", "[CORE][ERROR]")
 {
diff --git a/tests/Nazara/Core/File.cpp b/tests/Nazara/Core/File.cpp
index 1527632f8..7da5ad689 100644
--- a/tests/Nazara/Core/File.cpp
+++ b/tests/Nazara/Core/File.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/File.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("File", "[CORE][FILE]")
 {
diff --git a/tests/Nazara/Core/String.cpp b/tests/Nazara/Core/String.cpp
index 88daf56da..80e227ef1 100644
--- a/tests/Nazara/Core/String.cpp
+++ b/tests/Nazara/Core/String.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/String.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("String", "[CORE][STRING]")
 {
diff --git a/tests/Nazara/Core/StringStream.cpp b/tests/Nazara/Core/StringStream.cpp
index 62f0b794e..b5d1f56dc 100644
--- a/tests/Nazara/Core/StringStream.cpp
+++ b/tests/Nazara/Core/StringStream.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Core/StringStream.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("StringStream", "[CORE][STRINGSTREAM]")
 {
diff --git a/tests/Nazara/Math/Algorithm.cpp b/tests/Nazara/Math/Algorithm.cpp
index 8683a3058..f0bcbc0f1 100644
--- a/tests/Nazara/Math/Algorithm.cpp
+++ b/tests/Nazara/Math/Algorithm.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Algorithm.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 TEST_CASE("Approach", "[MATH][ALGORITHM]" )
 {
diff --git a/tests/Nazara/Math/BoundingVolume.cpp b/tests/Nazara/Math/BoundingVolume.cpp
index 57c82cfeb..895999536 100644
--- a/tests/Nazara/Math/BoundingVolume.cpp
+++ b/tests/Nazara/Math/BoundingVolume.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/BoundingVolume.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("BoundingVolume", "[MATH][BOUNDINGVOLUME]")
 {
diff --git a/tests/Nazara/Math/Box.cpp b/tests/Nazara/Math/Box.cpp
index 724fe1ec5..89e65e0c0 100644
--- a/tests/Nazara/Math/Box.cpp
+++ b/tests/Nazara/Math/Box.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Box.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Box", "[MATH][BOX]")
 {
diff --git a/tests/Nazara/Math/EulerAngles.cpp b/tests/Nazara/Math/EulerAngles.cpp
index 6a4508179..62ee61340 100644
--- a/tests/Nazara/Math/EulerAngles.cpp
+++ b/tests/Nazara/Math/EulerAngles.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/EulerAngles.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("EulerAngles", "[MATH][EULERANGLES]")
 {
diff --git a/tests/Nazara/Math/Frustum.cpp b/tests/Nazara/Math/Frustum.cpp
index ae13afe7b..3b4494fb3 100644
--- a/tests/Nazara/Math/Frustum.cpp
+++ b/tests/Nazara/Math/Frustum.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Frustum.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Frustum", "[MATH][FRUSTUM]")
 {
diff --git a/tests/Nazara/Math/Matrix4.cpp b/tests/Nazara/Math/Matrix4.cpp
index ea61e4541..9e31ff4e5 100644
--- a/tests/Nazara/Math/Matrix4.cpp
+++ b/tests/Nazara/Math/Matrix4.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Matrix4.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Matrix4", "[MATH][MATRIX4]")
 {
diff --git a/tests/Nazara/Math/OrientedBox.cpp b/tests/Nazara/Math/OrientedBox.cpp
index c5b650c7d..b465f06ca 100644
--- a/tests/Nazara/Math/OrientedBox.cpp
+++ b/tests/Nazara/Math/OrientedBox.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/OrientedBox.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("OrientedBox", "[MATH][ORIENTEDBOX]")
 {
diff --git a/tests/Nazara/Math/Plane.cpp b/tests/Nazara/Math/Plane.cpp
index 59db2ef29..59c6a0ac3 100644
--- a/tests/Nazara/Math/Plane.cpp
+++ b/tests/Nazara/Math/Plane.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Plane.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Plane", "[MATH][PLANE]")
 {
diff --git a/tests/Nazara/Math/Quaternion.cpp b/tests/Nazara/Math/Quaternion.cpp
index 7ce748cbf..905d17f6c 100644
--- a/tests/Nazara/Math/Quaternion.cpp
+++ b/tests/Nazara/Math/Quaternion.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Quaternion.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Quaternion", "[MATH][QUATERNION]")
 {
diff --git a/tests/Nazara/Math/Ray.cpp b/tests/Nazara/Math/Ray.cpp
index 3b7c4648c..0f2ba34df 100644
--- a/tests/Nazara/Math/Ray.cpp
+++ b/tests/Nazara/Math/Ray.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Ray.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Ray", "[RAY]")
 {
diff --git a/tests/Nazara/Math/Rect.cpp b/tests/Nazara/Math/Rect.cpp
index a09eb747c..60f302206 100644
--- a/tests/Nazara/Math/Rect.cpp
+++ b/tests/Nazara/Math/Rect.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Rect.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Rect", "[MATH][RECT]")
 {
diff --git a/tests/Nazara/Math/Sphere.cpp b/tests/Nazara/Math/Sphere.cpp
index cb668999a..ee902eb6a 100644
--- a/tests/Nazara/Math/Sphere.cpp
+++ b/tests/Nazara/Math/Sphere.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Sphere.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 SCENARIO("Sphere", "[MATH][SPHERE]")
 {
diff --git a/tests/Nazara/Math/Vector2.cpp b/tests/Nazara/Math/Vector2.cpp
index 533a6bf35..07f7dd5c3 100644
--- a/tests/Nazara/Math/Vector2.cpp
+++ b/tests/Nazara/Math/Vector2.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Vector2.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 #include <Nazara/Math/Vector4.hpp>
 
diff --git a/tests/Nazara/Math/Vector3.cpp b/tests/Nazara/Math/Vector3.cpp
index de8290a64..49239a9d0 100644
--- a/tests/Nazara/Math/Vector3.cpp
+++ b/tests/Nazara/Math/Vector3.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Vector3.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 #include <Nazara/Math/Vector4.hpp>
 
diff --git a/tests/Nazara/Math/Vector4.cpp b/tests/Nazara/Math/Vector4.cpp
index ba60c2232..f2f14daad 100644
--- a/tests/Nazara/Math/Vector4.cpp
+++ b/tests/Nazara/Math/Vector4.cpp
@@ -1,5 +1,5 @@
 #include <Nazara/Math/Vector4.hpp>
-#include <catch.hpp>
+#include <Catch/catch.hpp>
 
 #include <Nazara/Math/Vector3.hpp>
 
diff --git a/tests/main.cpp b/tests/main.cpp
index b3143fbb1..7be81a57e 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <Catch/catch.hpp>