diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
index 04aeb7a5770..7e47ec79bfe 100644
--- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
+++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java
@@ -87,7 +87,9 @@ private static void setFrameworks(AgentSpan span, Collection<TestFramework> fram
       TestFramework framework = frameworks.iterator().next();
       Map<String, String> tags = new HashMap<>();
       tags.put(Tags.TEST_FRAMEWORK, framework.getName());
-      tags.put(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+      if (framework.getVersion() != null) {
+        tags.put(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+      }
       span.setAllTags(tags);
       return;
     }