diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlare.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlareReporter.java
similarity index 99%
rename from dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlare.java
rename to dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlareReporter.java
index 97ff632f0da..0d5cf2617e3 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlare.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilerFlareReporter.java
@@ -13,8 +13,8 @@
 import java.util.Map;
 import java.util.zip.ZipOutputStream;
 
-public final class ProfilerFlare implements TracerFlare.Reporter {
-  private static final ProfilerFlare INSTANCE = new ProfilerFlare();
+public final class ProfilerFlareReporter implements TracerFlare.Reporter {
+  private static final ProfilerFlareReporter INSTANCE = new ProfilerFlareReporter();
   private static Exception profilerInitializationException;
 
   public static void register() {
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
index bb169f20791..06c03d8906a 100644
--- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
+++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java
@@ -95,7 +95,7 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
 
       // Register the profiler flare before we start the profiling system, but early during the
       // profiler lifecycle
-      ProfilerFlare.register();
+      ProfilerFlareReporter.register();
 
       boolean startForceFirst =
           Platform.isNativeImage()
@@ -176,11 +176,11 @@ public static synchronized boolean run(final boolean earlyStart, Instrumentation
         //   a detailed telemetry message has been sent from the attempts to enable the controllers
         // -----------------------------------------------------------------------------------------
         // but we do want to report this within the profiler flare
-        ProfilerFlare.reportInitializationException(e);
+        ProfilerFlareReporter.reportInitializationException(e);
       } catch (final ConfigurationException e) {
         log.warn("Failed to initialize profiling agent! {}", e.getMessage());
         log.debug(SEND_TELEMETRY, "Failed to initialize profiling agent!", e);
-        ProfilerFlare.reportInitializationException(e);
+        ProfilerFlareReporter.reportInitializationException(e);
       }
     }
     return false;
diff --git a/dd-smoke-tests/tracer-flare/src/test/groovy/datadog/smoketest/TracerFlareSmokeTest.groovy b/dd-smoke-tests/tracer-flare/src/test/groovy/datadog/smoketest/TracerFlareSmokeTest.groovy
index 9ecd92795c3..309ac97110a 100644
--- a/dd-smoke-tests/tracer-flare/src/test/groovy/datadog/smoketest/TracerFlareSmokeTest.groovy
+++ b/dd-smoke-tests/tracer-flare/src/test/groovy/datadog/smoketest/TracerFlareSmokeTest.groovy
@@ -23,8 +23,10 @@ import java.util.zip.ZipInputStream
  */
 class TracerFlareSmokeTest extends AbstractSmokeTest {
 
-  // Time in seconds after which flare is triggered
-  private static final int FLARE_TRIGGER_SECONDS = 15
+
+  // Time in seconds after which flare is triggered.
+  // We delay the profiler start on Oracle JDK 8, so increase the wait time to at least 20s.
+  private static final int FLARE_TRIGGER_SECONDS = 20
   // Number of processes to run in parallel for testing
   private static final int NUMBER_OF_PROCESSES = 2