diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49e140dec2f..f175868c407 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -377,8 +377,8 @@ muzzle-dep-report:
   needs: [ build_tests ]
   stage: tests
   variables:
-    KUBERNETES_MEMORY_REQUEST: 16Gi
-    KUBERNETES_MEMORY_LIMIT: 16Gi
+    KUBERNETES_MEMORY_REQUEST: 17Gi
+    KUBERNETES_MEMORY_LIMIT: 17Gi
     KUBERNETES_CPU_REQUEST: 10
     GRADLE_WORKERS: 4
     GRADLE_MEM: 3G
@@ -402,7 +402,7 @@ muzzle-dep-report:
       export PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/${CI_JOB_NAME_SLUG}.jfr,dumponexit=true";
       fi
     - *prepare_test_env
-    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M"
+    - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=1024M -Ddatadog.forkedMinHeapSize=128M"
     - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PtestJvm=$testJvm -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS --continue || $CONTINUE_ON_FAILURE
   after_script:
     - *restore_pretest_env
diff --git a/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java b/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
index 1b39118b3e1..79aba1d601b 100644
--- a/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
+++ b/dd-java-agent/instrumentation/exception-profiling/src/test/java/datadog/trace/bootstrap/instrumentation/jfr/exceptions/ExceptionHistogramTest.java
@@ -21,6 +21,7 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openjdk.jmc.common.item.Aggregators;
@@ -60,9 +61,13 @@ public boolean equals(final Object obj) {
   private Recording snapshot;
   private ExceptionHistogram instance;
 
+  @BeforeAll
+  public static void precheck() {
+    assumeFalse(Platform.isJ9());
+  }
+
   @BeforeEach
   public void setup() {
-    assumeFalse(Platform.isJ9());
     recording = new Recording();
     recording.enable("datadog.ExceptionCount");
     recording.start();
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
index 1ae8303df4b..1b107f7c31d 100644
--- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
+++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java
@@ -32,7 +32,7 @@ public static ProcessBuilder createProcessBuilder(
         Arrays.asList(
             javaPath(),
             // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5006",
-            "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
+            "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
             "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
             "-javaagent:" + agentShadowJar(),
             "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
index 02d49e29961..6adf84ddacc 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java
@@ -748,7 +748,7 @@ private static ProcessBuilder createProcessBuilder(
     final List<String> command =
         Arrays.asList(
             javaPath(),
-            "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
+            "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
             "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
             "-javaagent:" + agentShadowJar(),
             "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
diff --git a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
index 12bceeeadd0..d1a13d80fb5 100644
--- a/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
+++ b/dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/SmokeTestUtils.java
@@ -28,7 +28,7 @@ static ProcessBuilder createProcessBuilder(
         new ArrayList<>(
             Arrays.asList(
                 javaPath(),
-                "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M"),
+                "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M"),
                 "-Xms" + System.getProperty("datadog.forkedMinHeapSize", "64M"),
                 "-javaagent:" + agentShadowJar(),
                 "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java b/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
index 5363edc9dd7..03e8a279ad5 100644
--- a/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
+++ b/utils/test-utils/src/main/java/datadog/trace/test/util/ForkedTestUtils.java
@@ -2,7 +2,7 @@
 
 public class ForkedTestUtils {
   public static String getMaxMemoryArgumentForFork() {
-    return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "512M");
+    return "-Xmx" + System.getProperty("datadog.forkedMaxHeapSize", "1024M");
   }
 
   public static String getMinMemoryArgumentForFork() {