diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml
index 07bfbe9ad3a..eac6451966e 100644
--- a/manifests/nodejs.yml
+++ b/manifests/nodejs.yml
@@ -517,7 +517,7 @@ tests/:
       test_security_controls.py:
         TestSecurityControls:
           '*': *ref_5_37_0
-          fastify: flaky (APPSEC-58724)
+          fastify: *ref_5_61_0
           nextjs: missing_feature
     rasp/:
       test_api10.py:
diff --git a/tests/appsec/iast/test_security_controls.py b/tests/appsec/iast/test_security_controls.py
index 9d46a12cbb8..fc4caf1a271 100644
--- a/tests/appsec/iast/test_security_controls.py
+++ b/tests/appsec/iast/test_security_controls.py
@@ -2,13 +2,14 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2021 Datadog, Inc.
 
-from utils import features, rfc, weblog, irrelevant
+from utils import features, rfc, weblog, irrelevant, flaky, context
 from tests.appsec.iast.utils import BaseSinkTest, assert_iast_vulnerability, assert_metric
 from utils._weblog import HttpResponse
 
 
 @features.iast_security_controls
 @rfc("https://docs.google.com/document/d/1j1hp87-2wJnXUGADZxzLnvKJmaF_Gd6ZR1hPS3LVguQ/edit?pli=1&tab=t.0")
+@flaky(context.library <= "nodejs@5.80" and context.weblog_variant == "fastify", reason="APPSEC-58724")
 class TestSecurityControls:
     @staticmethod
     def assert_iast_is_enabled(request: HttpResponse) -> None: