diff --git a/test/Graphics/BlendMode.cpp b/test/Graphics/BlendMode.cpp
index 063fd780f..c63befd31 100644
--- a/test/Graphics/BlendMode.cpp
+++ b/test/Graphics/BlendMode.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/BlendMode.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/CircleShape.cpp b/test/Graphics/CircleShape.cpp
index bf51dc4b6..253b80c8b 100644
--- a/test/Graphics/CircleShape.cpp
+++ b/test/Graphics/CircleShape.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/CircleShape.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Color.cpp b/test/Graphics/Color.cpp
index 082880774..fb60573e9 100644
--- a/test/Graphics/Color.cpp
+++ b/test/Graphics/Color.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Color.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/ConvexShape.cpp b/test/Graphics/ConvexShape.cpp
index 7b5632ae2..5273fe7c7 100644
--- a/test/Graphics/ConvexShape.cpp
+++ b/test/Graphics/ConvexShape.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/ConvexShape.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Glyph.cpp b/test/Graphics/Glyph.cpp
index 4396e9671..52e767454 100644
--- a/test/Graphics/Glyph.cpp
+++ b/test/Graphics/Glyph.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Glyph.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Image.cpp b/test/Graphics/Image.cpp
index 4d8521088..033908eb8 100644
--- a/test/Graphics/Image.cpp
+++ b/test/Graphics/Image.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Image.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 #include <array>
 
 #include <doctest.h>
diff --git a/test/Graphics/Rect.cpp b/test/Graphics/Rect.cpp
index ba6d78d89..e83c3cf33 100644
--- a/test/Graphics/Rect.cpp
+++ b/test/Graphics/Rect.cpp
@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/System/Vector2.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/RectangleShape.cpp b/test/Graphics/RectangleShape.cpp
index a343cdbed..d90dc05de 100644
--- a/test/Graphics/RectangleShape.cpp
+++ b/test/Graphics/RectangleShape.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/RectangleShape.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/RenderStates.cpp b/test/Graphics/RenderStates.cpp
index 3615529d0..32cedcc7c 100644
--- a/test/Graphics/RenderStates.cpp
+++ b/test/Graphics/RenderStates.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/RenderStates.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Shape.cpp b/test/Graphics/Shape.cpp
index 79a34b480..b8e704ba1 100644
--- a/test/Graphics/Shape.cpp
+++ b/test/Graphics/Shape.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Shape.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Transform.cpp b/test/Graphics/Transform.cpp
index 8886d606c..ff59c5552 100644
--- a/test/Graphics/Transform.cpp
+++ b/test/Graphics/Transform.cpp
@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Transform.hpp>
 #include <SFML/System/Angle.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 #include <vector>
 
 #include <doctest.h>
diff --git a/test/Graphics/Transformable.cpp b/test/Graphics/Transformable.cpp
index 0b4ae1ef1..d69eebfa9 100644
--- a/test/Graphics/Transformable.cpp
+++ b/test/Graphics/Transformable.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Transformable.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/Vertex.cpp b/test/Graphics/Vertex.cpp
index b6ea904c3..8356b1577 100644
--- a/test/Graphics/Vertex.cpp
+++ b/test/Graphics/Vertex.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/Vertex.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/VertexArray.cpp b/test/Graphics/VertexArray.cpp
index 8c1ad01a9..0ba3e563d 100644
--- a/test/Graphics/VertexArray.cpp
+++ b/test/Graphics/VertexArray.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/VertexArray.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/Graphics/View.cpp b/test/Graphics/View.cpp
index 613561445..2ff53c942 100644
--- a/test/Graphics/View.cpp
+++ b/test/Graphics/View.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Graphics/View.hpp>
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/System/Angle.cpp b/test/System/Angle.cpp
index 87618f05d..834983e99 100644
--- a/test/System/Angle.cpp
+++ b/test/System/Angle.cpp
@@ -1,5 +1,5 @@
 #include <SFML/System/Angle.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/System/Clock.cpp b/test/System/Clock.cpp
index 2c5631a2c..3d28afa9a 100644
--- a/test/System/Clock.cpp
+++ b/test/System/Clock.cpp
@@ -1,6 +1,6 @@
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Time.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 #include <thread>
 
 #include <doctest.h>
diff --git a/test/System/Time.cpp b/test/System/Time.cpp
index 297d798d3..8d2d07302 100644
--- a/test/System/Time.cpp
+++ b/test/System/Time.cpp
@@ -1,5 +1,5 @@
 #include <SFML/System/Time.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <doctest.h>
 
diff --git a/test/System/Vector2.cpp b/test/System/Vector2.cpp
index f4bca0880..276365539 100644
--- a/test/System/Vector2.cpp
+++ b/test/System/Vector2.cpp
@@ -1,5 +1,5 @@
 #include <SFML/System/Vector2.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 #include <type_traits>
 #include <cmath>
 
diff --git a/test/System/Vector3.cpp b/test/System/Vector3.cpp
index 4b4bb0020..f838d84f5 100644
--- a/test/System/Vector3.cpp
+++ b/test/System/Vector3.cpp
@@ -1,5 +1,5 @@
 #include <SFML/System/Vector3.hpp>
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 #include <type_traits>
 
 #include <doctest.h>
diff --git a/test/TestUtilities/GraphicsUtil.cpp b/test/TestUtilities/GraphicsUtil.cpp
index c81879973..58e132662 100644
--- a/test/TestUtilities/GraphicsUtil.cpp
+++ b/test/TestUtilities/GraphicsUtil.cpp
@@ -1,4 +1,4 @@
-#include "GraphicsUtil.hpp"
+#include <GraphicsUtil.hpp>
 
 #include <SFML/Graphics/BlendMode.hpp>
 #include <SFML/Graphics/Color.hpp>
diff --git a/test/TestUtilities/GraphicsUtil.hpp b/test/TestUtilities/GraphicsUtil.hpp
index 1c9b8089a..737fb9386 100644
--- a/test/TestUtilities/GraphicsUtil.hpp
+++ b/test/TestUtilities/GraphicsUtil.hpp
@@ -6,7 +6,7 @@
 #ifndef SFML_TESTUTILITIES_GRAPHICS_HPP
 #define SFML_TESTUTILITIES_GRAPHICS_HPP
 
-#include "WindowUtil.hpp"
+#include <WindowUtil.hpp>
 
 #include <SFML/Graphics/Rect.hpp>
 #include <iomanip>
diff --git a/test/TestUtilities/SystemUtil.cpp b/test/TestUtilities/SystemUtil.cpp
index 2bd554bca..99e6e0752 100644
--- a/test/TestUtilities/SystemUtil.cpp
+++ b/test/TestUtilities/SystemUtil.cpp
@@ -1,4 +1,4 @@
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 #include <SFML/System/Angle.hpp>
 #include <SFML/System/String.hpp>
diff --git a/test/TestUtilities/WindowUtil.hpp b/test/TestUtilities/WindowUtil.hpp
index 57777edee..a0d0bc1a2 100644
--- a/test/TestUtilities/WindowUtil.hpp
+++ b/test/TestUtilities/WindowUtil.hpp
@@ -6,7 +6,7 @@
 #ifndef SFML_TESTUTILITIES_WINDOW_HPP
 #define SFML_TESTUTILITIES_WINDOW_HPP
 
-#include "SystemUtil.hpp"
+#include <SystemUtil.hpp>
 
 // String conversions for doctest framework
 namespace sf
diff --git a/test/Window/VideoMode.cpp b/test/Window/VideoMode.cpp
index 0bfefc371..195045e3c 100644
--- a/test/Window/VideoMode.cpp
+++ b/test/Window/VideoMode.cpp
@@ -1,5 +1,5 @@
 #include <SFML/Window/VideoMode.hpp>
-#include "WindowUtil.hpp"
+#include <WindowUtil.hpp>
 
 #include <doctest.h>