diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a2ccb1a3f..627aebbe8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(GRAPHICS_SRC
     Graphics/BlendMode.cpp
     Graphics/Color.cpp
     Graphics/Rect.cpp
+    Graphics/Shape.cpp
     Graphics/Transform.cpp
     Graphics/Transformable.cpp
     Graphics/Vertex.cpp
diff --git a/test/Graphics/Shape.cpp b/test/Graphics/Shape.cpp
new file mode 100644
index 000000000..8da42ab3c
--- /dev/null
+++ b/test/Graphics/Shape.cpp
@@ -0,0 +1,101 @@
+#include <SFML/Graphics/Shape.hpp>
+#include "GraphicsUtil.hpp"
+
+#include <doctest.h>
+
+using doctest::Approx;
+
+class TriangleShape : public sf::Shape
+{
+public:
+    explicit TriangleShape(const sf::Vector2f& size)
+        : m_size(size)
+    {
+        update();
+    }
+
+    std::size_t getPointCount() const override
+    {
+        return 3;
+    }
+
+    sf::Vector2f getPoint(std::size_t index) const override
+    {
+        switch (index)
+        {
+            default:
+            case 0: return sf::Vector2f(m_size.x / 2, 0);
+            case 1: return sf::Vector2f(0, m_size.y);
+            case 2: return sf::Vector2f(m_size.x, m_size.y);
+        }
+    }
+
+private:
+    sf::Vector2f m_size;
+};
+
+TEST_CASE("sf::Shape class - [graphics]")
+{
+    SUBCASE("Default constructor")
+    {
+        const TriangleShape triangleShape({0, 0});
+        CHECK(triangleShape.getTexture() == nullptr);
+        CHECK(triangleShape.getTextureRect() == sf::IntRect());
+        CHECK(triangleShape.getFillColor() == sf::Color::White);
+        CHECK(triangleShape.getOutlineColor() == sf::Color::White);
+        CHECK(triangleShape.getOutlineThickness() == 0.0f);
+        CHECK(triangleShape.getLocalBounds() == sf::FloatRect());
+        CHECK(triangleShape.getGlobalBounds() == sf::FloatRect());
+    }
+
+    SUBCASE("Set/get texture rect")
+    {
+        TriangleShape triangleShape({});
+        triangleShape.setTextureRect({{4, 5}, {6, 7}});
+        CHECK(triangleShape.getTextureRect() == sf::IntRect({4, 5}, {6, 7}));
+    }
+
+    SUBCASE("Set/get fill color")
+    {
+        TriangleShape triangleShape({});
+        triangleShape.setFillColor(sf::Color::Cyan);
+        CHECK(triangleShape.getFillColor() == sf::Color::Cyan);
+    }
+
+    SUBCASE("Set/get outline color")
+    {
+        TriangleShape triangleShape({});
+        triangleShape.setOutlineColor(sf::Color::Magenta);
+        CHECK(triangleShape.getOutlineColor() == sf::Color::Magenta);
+    }
+
+    SUBCASE("Set/get outline thickness")
+    {
+        TriangleShape triangleShape({});
+        triangleShape.setOutlineThickness(3.14f);
+        CHECK(triangleShape.getOutlineThickness() == 3.14f);
+    }
+
+    SUBCASE("Virtual functions: getPoint, getPointCount")
+    {
+        const TriangleShape triangleShape({2, 2});
+        CHECK(triangleShape.getPointCount() == 3);
+        CHECK(triangleShape.getPoint(0) == sf::Vector2f(1, 0));
+        CHECK(triangleShape.getPoint(1) == sf::Vector2f(0, 2));
+        CHECK(triangleShape.getPoint(2) == sf::Vector2f(2, 2));
+    }
+
+    SUBCASE("Get bounds")
+    {
+        TriangleShape triangleShape({2, 3});
+        CHECK(triangleShape.getLocalBounds() == sf::FloatRect({0, 0}, {2, 3}));
+        CHECK(triangleShape.getGlobalBounds() == sf::FloatRect({0, 0}, {2, 3}));
+        triangleShape.move({1, 1});
+        triangleShape.rotate(sf::degrees(90));
+        CHECK(triangleShape.getLocalBounds() == sf::FloatRect({0, 0}, {2, 3}));
+        CHECK(triangleShape.getGlobalBounds().left == Approx(-2.f));
+        CHECK(triangleShape.getGlobalBounds().top == Approx(1.f));
+        CHECK(triangleShape.getGlobalBounds().width == Approx(3.f));
+        CHECK(triangleShape.getGlobalBounds().height == Approx(2.f));
+    }
+}