diff --git a/doc/changelog.d/2118.added.md b/doc/changelog.d/2118.added.md
new file mode 100644
index 0000000000..4c32200adf
--- /dev/null
+++ b/doc/changelog.d/2118.added.md
@@ -0,0 +1 @@
+Surface body unit test fix
\ No newline at end of file
diff --git a/src/ansys/geometry/core/_grpc/_services/v0/repair_tools.py b/src/ansys/geometry/core/_grpc/_services/v0/repair_tools.py
index 929fdf26d1..8c25d5c7f8 100644
--- a/src/ansys/geometry/core/_grpc/_services/v0/repair_tools.py
+++ b/src/ansys/geometry/core/_grpc/_services/v0/repair_tools.py
@@ -620,6 +620,7 @@ def serialize_body(body):
                 },
                 "master_id": body.master_id,
                 "parent_id": body.parent_id,
+                "is_surface": body.is_surface,
             }
 
         def serialize_entity_identifier(entity):
diff --git a/src/ansys/geometry/core/tools/problem_areas.py b/src/ansys/geometry/core/tools/problem_areas.py
index 53326adabb..cac2d552c5 100644
--- a/src/ansys/geometry/core/tools/problem_areas.py
+++ b/src/ansys/geometry/core/tools/problem_areas.py
@@ -111,6 +111,7 @@ def serialize_body(body):
                 },
                 "master_id": body.master_id,
                 "parent_id": body.parent_id,
+                "is_surface": body.is_surface,
             }
 
         def serialize_entity_identifier(entity):
diff --git a/tests/integration/test_repair_tools.py b/tests/integration/test_repair_tools.py
index 1bea52df71..c02d5b54ba 100644
--- a/tests/integration/test_repair_tools.py
+++ b/tests/integration/test_repair_tools.py
@@ -403,10 +403,9 @@ def test_find_and_fix_missing_faces(modeler: Modeler):
         for face in missing_faces:
             face.fix()
 
-    # TODO : Add surface body check from backend. Issue is being tracked in #2031.
-    # assert not design.bodies[0].is_surface
-    # for comp in design.components:
-    #    assert not comp.bodies[0].is_surface
+    assert not design.bodies[0].is_surface
+    for comp in design.components:
+        assert not comp.bodies[0].is_surface
 
 
 def test_find_and_fix_missing_faces_angle_distance(modeler: Modeler):
@@ -458,8 +457,7 @@ def test_find_and_stitch_and_missing_faces(modeler: Modeler):
     for i in stitch_faces:
         i.fix()
     assert len(design.bodies) == 1
-    # TODO : Add surface body check from backend. Issue is being tracked in #2031.
-    # assert design.bodies[0].is_surface
+    assert design.bodies[0].is_surface
     missing_faces = modeler.repair_tools.find_missing_faces(design.bodies)
     for face in missing_faces:
         face.fix()