diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry.gradle
index 1ee381f6d18..6cf63e69057 100644
--- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry.gradle
+++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry.gradle
@@ -1,3 +1,7 @@
+ext {
+  minJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
 // Made this a variable so we can easily update to latest releases.
 def otelVersion = '0.3.0'
 
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelContextPropagators.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelScope.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelScope.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelSpan.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelSpanContext.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelTracer.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/OtelTracerProvider.java
diff --git a/dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java b/dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
similarity index 100%
rename from dd-java-agent/instrumentation/opentelemetry/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java
rename to dd-java-agent/instrumentation/opentelemetry/src/main/java8/datadog/trace/instrumentation/opentelemetry/TypeConverter.java