diff --git a/tests/appsec/waf/test_addresses.py b/tests/appsec/waf/test_addresses.py
index 3e5e474934..74ebc67876 100644
--- a/tests/appsec/waf/test_addresses.py
+++ b/tests/appsec/waf/test_addresses.py
@@ -323,7 +323,10 @@ def setup_xml_attr_value(self):
         self.r_attr_1 = self.weblog_post("/waf", data='<string attack="var_dump ()" />')
         self.r_attr_2 = self.weblog_post("/waf", data=f'<string attack="{self.ENCODED_ATTACK}" />')
 
-    @bug(context.weblog_variant in ("spring-boot-payara", "spring-boot-wildfly"))
+    @bug(
+        context.library <= "java@1.39.1" and context.weblog_variant in ("spring-boot-payara", "spring-boot-wildfly"),
+        reason="APMRP-360",
+    )
     def test_xml_attr_value(self):
         interfaces.library.assert_waf_attack(self.r_attr_1, address="server.request.body", value="var_dump ()")
         interfaces.library.assert_waf_attack(self.r_attr_2, address="server.request.body", value=self.ATTACK)
@@ -332,7 +335,10 @@ def setup_xml_content(self):
         self.r_content_1 = self.weblog_post("/waf", data="<string>var_dump ()</string>")
         self.r_content_2 = self.weblog_post("/waf", data=f"<string>{self.ENCODED_ATTACK}</string>")
 
-    @bug(context.weblog_variant in ("spring-boot-payara", "spring-boot-wildfly"))
+    @bug(
+        context.library <= "java@1.39.1" and context.weblog_variant in ("spring-boot-payara", "spring-boot-wildfly"),
+        reason="APMRP-360",
+    )
     def test_xml_content(self):
         interfaces.library.assert_waf_attack(self.r_content_1, address="server.request.body", value="var_dump ()")
         interfaces.library.assert_waf_attack(self.r_content_2, address="server.request.body", value=self.ATTACK)
diff --git a/tests/parametric/test_otel_span_methods.py b/tests/parametric/test_otel_span_methods.py
index 26d41c7245..f290df9ef5 100644
--- a/tests/parametric/test_otel_span_methods.py
+++ b/tests/parametric/test_otel_span_methods.py
@@ -564,7 +564,7 @@ def test_otel_span_started_with_link_from_datadog_headers(self, test_agent, test
     @missing_feature(context.library < "java@1.28.0", reason="Implemented in 1.28.0")
     @missing_feature(context.library < "nodejs@5.3.0", reason="Implemented in 3.48.0, 4.27.0, and 5.3.0")
     @missing_feature(context.library < "golang@1.61.0", reason="Implemented in 1.61.0")
-    @bug(context.library == "ruby", reason="opentelemetry propagator truncates 128bit trace_ids to 64bits")
+    @bug(context.library < "ruby@2.3.1-dev", reason="APMRP-360")
     @missing_feature(context.library == "php", reason="Implemented in 0.97.0 but link.flags are not natively supported")
     def test_otel_span_started_with_link_from_w3c_headers(self, test_agent, test_library):
         """Properly inject w3c distributed tracing information into span links.
diff --git a/tests/test_data_integrity.py b/tests/test_data_integrity.py
index 470688da0e..5c0cb1c9c6 100644
--- a/tests/test_data_integrity.py
+++ b/tests/test_data_integrity.py
@@ -72,7 +72,6 @@ def validator(data):
     def setup_trace_header_container_tags(self):
         self.r = weblog.get("/read_file", params={"file": "/proc/self/cgroup"})
 
-    @bug(library="cpp", reason="https://github.com/DataDog/dd-opentracing-cpp/issues/194")
     @missing_feature(
         context.library == "java" and "spring-boot" not in context.weblog_variant, reason="Missing endpoint"
     )
diff --git a/tests/test_identify.py b/tests/test_identify.py
index c38c92692b..cd401f5c36 100644
--- a/tests/test_identify.py
+++ b/tests/test_identify.py
@@ -35,15 +35,11 @@ def setup_identify_tags(self):
         # Send a request to the identify endpoint
         self.r = weblog.get("/identify")
 
-    @bug(
-        context.library <= "golang@1.41.0",
-        reason="DD_TRACE_HEADER_TAGS is not working properly, can't correlate request to trace",
-    )
-    @bug(
-        context.library < "nodejs@2.9.0",
-        reason="DD_TRACE_HEADER_TAGS is not working properly, can't correlate request to trace",
-    )
-    @bug(library="ruby", reason="DD_TRACE_HEADER_TAGS is not working properly, can't correlate request to trace")
+    # reason for those three skip was :
+    # DD_TRACE_HEADER_TAGS is not working properly, can't correlate request to trace
+    @bug(context.library <= "golang@1.41.0", reason="APMRP-360")
+    @bug(context.library < "nodejs@2.9.0", reason="APMRP-360")
+    @bug(context.library <= "ruby@2.3.0", reason="APMRP-360")
     def test_identify_tags(self):
         interfaces.library.validate_spans(
             self.r, validate_identify_tags(["id", "name", "email", "session_id", "role", "scope"])
diff --git a/tests/test_semantic_conventions.py b/tests/test_semantic_conventions.py
index 638cd1d889..79b59e1178 100644
--- a/tests/test_semantic_conventions.py
+++ b/tests/test_semantic_conventions.py
@@ -157,7 +157,7 @@ def validator(span):
         interfaces.library.validate_spans(validator=validator)
 
     @bug(library="ruby", reason="http.url is not a full url, should be discussed of actually a bug or not")
-    @bug(library="golang", reason="http.url is not a full url, should be discussed of actually a bug or not")
+    @bug(context.library < "golang@1.69.0-dev", reason="APMRP-360")
     @bug(context.library < "php@0.68.2", reason="APMRP-360")
     def test_meta_http_url(self):
         """Validates that traces from an http framework carry a http.url meta tag, formatted as a URL"""
diff --git a/tests/test_telemetry.py b/tests/test_telemetry.py
index 2fc63a03d6..e67998a8cf 100644
--- a/tests/test_telemetry.py
+++ b/tests/test_telemetry.py
@@ -237,9 +237,7 @@ def test_app_started_is_first_message(self):
                 app_started[0]["request"]["content"]["seq_id"] == min_seq_id
             ), "app-started is not the first message by seq_id"
 
-    @bug(
-        weblog_variant="spring-boot-openliberty", reason="APPSEC-6583",
-    )
+    @bug(weblog_variant="spring-boot-openliberty", reason="APPSEC-6583")
     @bug(weblog_variant="spring-boot-wildfly", reason="Jira missing")
     @bug(context.agent_version > "7.53.0", reason="Jira missing")
     def test_proxy_forwarding(self):