diff --git a/test/Audio/AlResource.cpp b/test/Audio/AlResource.test.cpp
similarity index 100%
rename from test/Audio/AlResource.cpp
rename to test/Audio/AlResource.test.cpp
diff --git a/test/Audio/InputSoundFile.cpp b/test/Audio/InputSoundFile.test.cpp
similarity index 100%
rename from test/Audio/InputSoundFile.cpp
rename to test/Audio/InputSoundFile.test.cpp
diff --git a/test/Audio/Music.cpp b/test/Audio/Music.test.cpp
similarity index 100%
rename from test/Audio/Music.cpp
rename to test/Audio/Music.test.cpp
diff --git a/test/Audio/OutputSoundFile.cpp b/test/Audio/OutputSoundFile.test.cpp
similarity index 100%
rename from test/Audio/OutputSoundFile.cpp
rename to test/Audio/OutputSoundFile.test.cpp
diff --git a/test/Audio/Sound.cpp b/test/Audio/Sound.test.cpp
similarity index 100%
rename from test/Audio/Sound.cpp
rename to test/Audio/Sound.test.cpp
diff --git a/test/Audio/SoundBuffer.cpp b/test/Audio/SoundBuffer.test.cpp
similarity index 100%
rename from test/Audio/SoundBuffer.cpp
rename to test/Audio/SoundBuffer.test.cpp
diff --git a/test/Audio/SoundBufferRecorder.cpp b/test/Audio/SoundBufferRecorder.test.cpp
similarity index 100%
rename from test/Audio/SoundBufferRecorder.cpp
rename to test/Audio/SoundBufferRecorder.test.cpp
diff --git a/test/Audio/SoundRecorder.cpp b/test/Audio/SoundRecorder.test.cpp
similarity index 100%
rename from test/Audio/SoundRecorder.cpp
rename to test/Audio/SoundRecorder.test.cpp
diff --git a/test/Audio/SoundSource.cpp b/test/Audio/SoundSource.test.cpp
similarity index 100%
rename from test/Audio/SoundSource.cpp
rename to test/Audio/SoundSource.test.cpp
diff --git a/test/Audio/SoundStream.cpp b/test/Audio/SoundStream.test.cpp
similarity index 100%
rename from test/Audio/SoundStream.cpp
rename to test/Audio/SoundStream.test.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4f53a8e4..74956896 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,16 +29,16 @@ target_link_libraries(sfml-test-main PUBLIC SFML::System doctest::doctest_with_m
 set_target_warnings(sfml-test-main)
 
 set(SYSTEM_SRC
-    System/Angle.cpp
-    System/Clock.cpp
-    System/Config.cpp
-    System/Err.cpp
-    System/FileInputStream.cpp
-    System/MemoryInputStream.cpp
-    System/String.cpp
-    System/Time.cpp
-    System/Vector2.cpp
-    System/Vector3.cpp
+    System/Angle.test.cpp
+    System/Clock.test.cpp
+    System/Config.test.cpp
+    System/Err.test.cpp
+    System/FileInputStream.test.cpp
+    System/MemoryInputStream.test.cpp
+    System/String.test.cpp
+    System/Time.test.cpp
+    System/Vector2.test.cpp
+    System/Vector3.test.cpp
 )
 sfml_add_test(test-sfml-system "${SYSTEM_SRC}" SFML::System)
 target_compile_definitions(test-sfml-system PRIVATE
@@ -49,69 +49,69 @@ target_compile_definitions(test-sfml-system PRIVATE
 )
 
 set(WINDOW_SRC
-    Window/Context.cpp
-    Window/ContextSettings.cpp
-    Window/Cursor.cpp
-    Window/GlResource.cpp
-    Window/VideoMode.cpp
-    Window/Window.cpp
-    Window/WindowBase.cpp
+    Window/Context.test.cpp
+    Window/ContextSettings.test.cpp
+    Window/Cursor.test.cpp
+    Window/GlResource.test.cpp
+    Window/VideoMode.test.cpp
+    Window/Window.test.cpp
+    Window/WindowBase.test.cpp
 )
 sfml_add_test(test-sfml-window "${WINDOW_SRC}" SFML::Window)
 
 set(GRAPHICS_SRC
-    Graphics/BlendMode.cpp
-    Graphics/CircleShape.cpp
-    Graphics/Color.cpp
-    Graphics/ConvexShape.cpp
-    Graphics/Drawable.cpp
-    Graphics/Font.cpp
-    Graphics/Glyph.cpp
-    Graphics/Image.cpp
-    Graphics/Rect.cpp
-    Graphics/RectangleShape.cpp
-    Graphics/RenderStates.cpp
-    Graphics/RenderTarget.cpp
-    Graphics/RenderTexture.cpp
-    Graphics/RenderWindow.cpp
-    Graphics/Shader.cpp
-    Graphics/Shape.cpp
-    Graphics/Sprite.cpp
-    Graphics/Text.cpp
-    Graphics/Texture.cpp
-    Graphics/Transform.cpp
-    Graphics/Transformable.cpp
-    Graphics/Vertex.cpp
-    Graphics/VertexArray.cpp
-    Graphics/VertexBuffer.cpp
-    Graphics/View.cpp
+    Graphics/BlendMode.test.cpp
+    Graphics/CircleShape.test.cpp
+    Graphics/Color.test.cpp
+    Graphics/ConvexShape.test.cpp
+    Graphics/Drawable.test.cpp
+    Graphics/Font.test.cpp
+    Graphics/Glyph.test.cpp
+    Graphics/Image.test.cpp
+    Graphics/Rect.test.cpp
+    Graphics/RectangleShape.test.cpp
+    Graphics/RenderStates.test.cpp
+    Graphics/RenderTarget.test.cpp
+    Graphics/RenderTexture.test.cpp
+    Graphics/RenderWindow.test.cpp
+    Graphics/Shader.test.cpp
+    Graphics/Shape.test.cpp
+    Graphics/Sprite.test.cpp
+    Graphics/Text.test.cpp
+    Graphics/Texture.test.cpp
+    Graphics/Transform.test.cpp
+    Graphics/Transformable.test.cpp
+    Graphics/Vertex.test.cpp
+    Graphics/VertexArray.test.cpp
+    Graphics/VertexBuffer.test.cpp
+    Graphics/View.test.cpp
 )
 sfml_add_test(test-sfml-graphics "${GRAPHICS_SRC}" SFML::Graphics)
 
 set(NETWORK_SRC
-    Network/Ftp.cpp
-    Network/Http.cpp
-    Network/IpAddress.cpp
-    Network/Packet.cpp
-    Network/Socket.cpp
-    Network/SocketSelector.cpp
-    Network/TcpListener.cpp
-    Network/TcpSocket.cpp
-    Network/UdpSocket.cpp
+    Network/Ftp.test.cpp
+    Network/Http.test.cpp
+    Network/IpAddress.test.cpp
+    Network/Packet.test.cpp
+    Network/Socket.test.cpp
+    Network/SocketSelector.test.cpp
+    Network/TcpListener.test.cpp
+    Network/TcpSocket.test.cpp
+    Network/UdpSocket.test.cpp
 )
 sfml_add_test(test-sfml-network "${NETWORK_SRC}" SFML::Network)
 
 set(AUDIO_SRC
-    Audio/AlResource.cpp
-    Audio/InputSoundFile.cpp
-    Audio/Music.cpp
-    Audio/OutputSoundFile.cpp
-    Audio/Sound.cpp
-    Audio/SoundBuffer.cpp
-    Audio/SoundBufferRecorder.cpp
-    Audio/SoundRecorder.cpp
-    Audio/SoundSource.cpp
-    Audio/SoundStream.cpp
+    Audio/AlResource.test.cpp
+    Audio/InputSoundFile.test.cpp
+    Audio/Music.test.cpp
+    Audio/OutputSoundFile.test.cpp
+    Audio/Sound.test.cpp
+    Audio/SoundBuffer.test.cpp
+    Audio/SoundBufferRecorder.test.cpp
+    Audio/SoundRecorder.test.cpp
+    Audio/SoundSource.test.cpp
+    Audio/SoundStream.test.cpp
 )
 sfml_add_test(test-sfml-audio "${AUDIO_SRC}" SFML::Audio)
 
diff --git a/test/Graphics/BlendMode.cpp b/test/Graphics/BlendMode.test.cpp
similarity index 100%
rename from test/Graphics/BlendMode.cpp
rename to test/Graphics/BlendMode.test.cpp
diff --git a/test/Graphics/CircleShape.cpp b/test/Graphics/CircleShape.test.cpp
similarity index 100%
rename from test/Graphics/CircleShape.cpp
rename to test/Graphics/CircleShape.test.cpp
diff --git a/test/Graphics/Color.cpp b/test/Graphics/Color.test.cpp
similarity index 100%
rename from test/Graphics/Color.cpp
rename to test/Graphics/Color.test.cpp
diff --git a/test/Graphics/ConvexShape.cpp b/test/Graphics/ConvexShape.test.cpp
similarity index 100%
rename from test/Graphics/ConvexShape.cpp
rename to test/Graphics/ConvexShape.test.cpp
diff --git a/test/Graphics/Drawable.cpp b/test/Graphics/Drawable.test.cpp
similarity index 100%
rename from test/Graphics/Drawable.cpp
rename to test/Graphics/Drawable.test.cpp
diff --git a/test/Graphics/Font.cpp b/test/Graphics/Font.test.cpp
similarity index 100%
rename from test/Graphics/Font.cpp
rename to test/Graphics/Font.test.cpp
diff --git a/test/Graphics/Glyph.cpp b/test/Graphics/Glyph.test.cpp
similarity index 100%
rename from test/Graphics/Glyph.cpp
rename to test/Graphics/Glyph.test.cpp
diff --git a/test/Graphics/Image.cpp b/test/Graphics/Image.test.cpp
similarity index 100%
rename from test/Graphics/Image.cpp
rename to test/Graphics/Image.test.cpp
diff --git a/test/Graphics/Rect.cpp b/test/Graphics/Rect.test.cpp
similarity index 100%
rename from test/Graphics/Rect.cpp
rename to test/Graphics/Rect.test.cpp
diff --git a/test/Graphics/RectangleShape.cpp b/test/Graphics/RectangleShape.test.cpp
similarity index 100%
rename from test/Graphics/RectangleShape.cpp
rename to test/Graphics/RectangleShape.test.cpp
diff --git a/test/Graphics/RenderStates.cpp b/test/Graphics/RenderStates.test.cpp
similarity index 100%
rename from test/Graphics/RenderStates.cpp
rename to test/Graphics/RenderStates.test.cpp
diff --git a/test/Graphics/RenderTarget.cpp b/test/Graphics/RenderTarget.test.cpp
similarity index 100%
rename from test/Graphics/RenderTarget.cpp
rename to test/Graphics/RenderTarget.test.cpp
diff --git a/test/Graphics/RenderTexture.cpp b/test/Graphics/RenderTexture.test.cpp
similarity index 100%
rename from test/Graphics/RenderTexture.cpp
rename to test/Graphics/RenderTexture.test.cpp
diff --git a/test/Graphics/RenderWindow.cpp b/test/Graphics/RenderWindow.test.cpp
similarity index 100%
rename from test/Graphics/RenderWindow.cpp
rename to test/Graphics/RenderWindow.test.cpp
diff --git a/test/Graphics/Shader.cpp b/test/Graphics/Shader.test.cpp
similarity index 100%
rename from test/Graphics/Shader.cpp
rename to test/Graphics/Shader.test.cpp
diff --git a/test/Graphics/Shape.cpp b/test/Graphics/Shape.test.cpp
similarity index 100%
rename from test/Graphics/Shape.cpp
rename to test/Graphics/Shape.test.cpp
diff --git a/test/Graphics/Sprite.cpp b/test/Graphics/Sprite.test.cpp
similarity index 100%
rename from test/Graphics/Sprite.cpp
rename to test/Graphics/Sprite.test.cpp
diff --git a/test/Graphics/Text.cpp b/test/Graphics/Text.test.cpp
similarity index 100%
rename from test/Graphics/Text.cpp
rename to test/Graphics/Text.test.cpp
diff --git a/test/Graphics/Texture.cpp b/test/Graphics/Texture.test.cpp
similarity index 100%
rename from test/Graphics/Texture.cpp
rename to test/Graphics/Texture.test.cpp
diff --git a/test/Graphics/Transform.cpp b/test/Graphics/Transform.test.cpp
similarity index 100%
rename from test/Graphics/Transform.cpp
rename to test/Graphics/Transform.test.cpp
diff --git a/test/Graphics/Transformable.cpp b/test/Graphics/Transformable.test.cpp
similarity index 100%
rename from test/Graphics/Transformable.cpp
rename to test/Graphics/Transformable.test.cpp
diff --git a/test/Graphics/Vertex.cpp b/test/Graphics/Vertex.test.cpp
similarity index 100%
rename from test/Graphics/Vertex.cpp
rename to test/Graphics/Vertex.test.cpp
diff --git a/test/Graphics/VertexArray.cpp b/test/Graphics/VertexArray.test.cpp
similarity index 100%
rename from test/Graphics/VertexArray.cpp
rename to test/Graphics/VertexArray.test.cpp
diff --git a/test/Graphics/VertexBuffer.cpp b/test/Graphics/VertexBuffer.test.cpp
similarity index 100%
rename from test/Graphics/VertexBuffer.cpp
rename to test/Graphics/VertexBuffer.test.cpp
diff --git a/test/Graphics/View.cpp b/test/Graphics/View.test.cpp
similarity index 100%
rename from test/Graphics/View.cpp
rename to test/Graphics/View.test.cpp
diff --git a/test/Network/Ftp.cpp b/test/Network/Ftp.test.cpp
similarity index 100%
rename from test/Network/Ftp.cpp
rename to test/Network/Ftp.test.cpp
diff --git a/test/Network/Http.cpp b/test/Network/Http.test.cpp
similarity index 100%
rename from test/Network/Http.cpp
rename to test/Network/Http.test.cpp
diff --git a/test/Network/IpAddress.cpp b/test/Network/IpAddress.test.cpp
similarity index 100%
rename from test/Network/IpAddress.cpp
rename to test/Network/IpAddress.test.cpp
diff --git a/test/Network/Packet.cpp b/test/Network/Packet.test.cpp
similarity index 100%
rename from test/Network/Packet.cpp
rename to test/Network/Packet.test.cpp
diff --git a/test/Network/Socket.cpp b/test/Network/Socket.test.cpp
similarity index 100%
rename from test/Network/Socket.cpp
rename to test/Network/Socket.test.cpp
diff --git a/test/Network/SocketSelector.cpp b/test/Network/SocketSelector.test.cpp
similarity index 100%
rename from test/Network/SocketSelector.cpp
rename to test/Network/SocketSelector.test.cpp
diff --git a/test/Network/TcpListener.cpp b/test/Network/TcpListener.test.cpp
similarity index 100%
rename from test/Network/TcpListener.cpp
rename to test/Network/TcpListener.test.cpp
diff --git a/test/Network/TcpSocket.cpp b/test/Network/TcpSocket.test.cpp
similarity index 100%
rename from test/Network/TcpSocket.cpp
rename to test/Network/TcpSocket.test.cpp
diff --git a/test/Network/UdpSocket.cpp b/test/Network/UdpSocket.test.cpp
similarity index 100%
rename from test/Network/UdpSocket.cpp
rename to test/Network/UdpSocket.test.cpp
diff --git a/test/System/Angle.cpp b/test/System/Angle.test.cpp
similarity index 100%
rename from test/System/Angle.cpp
rename to test/System/Angle.test.cpp
diff --git a/test/System/Clock.cpp b/test/System/Clock.test.cpp
similarity index 100%
rename from test/System/Clock.cpp
rename to test/System/Clock.test.cpp
diff --git a/test/System/Config.cpp b/test/System/Config.test.cpp
similarity index 100%
rename from test/System/Config.cpp
rename to test/System/Config.test.cpp
diff --git a/test/System/Err.cpp b/test/System/Err.test.cpp
similarity index 100%
rename from test/System/Err.cpp
rename to test/System/Err.test.cpp
diff --git a/test/System/FileInputStream.cpp b/test/System/FileInputStream.test.cpp
similarity index 100%
rename from test/System/FileInputStream.cpp
rename to test/System/FileInputStream.test.cpp
diff --git a/test/System/MemoryInputStream.cpp b/test/System/MemoryInputStream.test.cpp
similarity index 100%
rename from test/System/MemoryInputStream.cpp
rename to test/System/MemoryInputStream.test.cpp
diff --git a/test/System/String.cpp b/test/System/String.test.cpp
similarity index 100%
rename from test/System/String.cpp
rename to test/System/String.test.cpp
diff --git a/test/System/Time.cpp b/test/System/Time.test.cpp
similarity index 100%
rename from test/System/Time.cpp
rename to test/System/Time.test.cpp
diff --git a/test/System/Vector2.cpp b/test/System/Vector2.test.cpp
similarity index 100%
rename from test/System/Vector2.cpp
rename to test/System/Vector2.test.cpp
diff --git a/test/System/Vector3.cpp b/test/System/Vector3.test.cpp
similarity index 100%
rename from test/System/Vector3.cpp
rename to test/System/Vector3.test.cpp
diff --git a/test/Window/Context.cpp b/test/Window/Context.test.cpp
similarity index 100%
rename from test/Window/Context.cpp
rename to test/Window/Context.test.cpp
diff --git a/test/Window/ContextSettings.cpp b/test/Window/ContextSettings.test.cpp
similarity index 100%
rename from test/Window/ContextSettings.cpp
rename to test/Window/ContextSettings.test.cpp
diff --git a/test/Window/Cursor.cpp b/test/Window/Cursor.test.cpp
similarity index 100%
rename from test/Window/Cursor.cpp
rename to test/Window/Cursor.test.cpp
diff --git a/test/Window/GlResource.cpp b/test/Window/GlResource.test.cpp
similarity index 100%
rename from test/Window/GlResource.cpp
rename to test/Window/GlResource.test.cpp
diff --git a/test/Window/VideoMode.cpp b/test/Window/VideoMode.test.cpp
similarity index 100%
rename from test/Window/VideoMode.cpp
rename to test/Window/VideoMode.test.cpp
diff --git a/test/Window/Window.cpp b/test/Window/Window.test.cpp
similarity index 100%
rename from test/Window/Window.cpp
rename to test/Window/Window.test.cpp
diff --git a/test/Window/WindowBase.cpp b/test/Window/WindowBase.test.cpp
similarity index 100%
rename from test/Window/WindowBase.cpp
rename to test/Window/WindowBase.test.cpp