diff --git a/tests/YGNodeCallbackTest.cpp b/tests/YGNodeCallbackTest.cpp
index a130e66b..754c03c6 100644
--- a/tests/YGNodeCallbackTest.cpp
+++ b/tests/YGNodeCallbackTest.cpp
@@ -33,11 +33,7 @@ TEST(YGNode, measure_with_measure_fn) {
 
   n.setMeasureFunc(
       [](YGNode*, float w, YGMeasureMode wm, float h, YGMeasureMode hm) {
-// TODO: Correctly fix enum - float conversion warning: T158155910
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wenum-float-conversion"
-        return YGSize{w * wm, h / hm};
-#pragma clang diagnostic pop
+        return YGSize{w * static_cast<int>(wm), h / static_cast<int>(hm)};
       });
 
   ASSERT_EQ(
@@ -62,19 +58,11 @@ TEST(YGNode, switching_measure_fn_types) {
   auto n = YGNode{};
   n.setMeasureFunc(
       [](YGNode*, float, YGMeasureMode, float, YGMeasureMode, void*) {
-// TODO: Properly fix enum - float conversion warning: T158155910
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wenum-float-conversion"
         return YGSize{};
-#pragma clang diagnostic pop
       });
   n.setMeasureFunc(
       [](YGNode*, float w, YGMeasureMode wm, float h, YGMeasureMode hm) {
-// TODO: Properly fix enum - float conversion warning: T158155910
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wenum-float-conversion"
-        return YGSize{w * wm, h / hm};
-#pragma clang diagnostic pop
+        return YGSize{w * static_cast<int>(wm), h / static_cast<int>(hm)};
       });
 
   ASSERT_EQ(