diff --git a/.github/workflows/reusable-native-tests.yml b/.github/workflows/reusable-native-tests.yml
index 451e9cf8b9f5..b9ac37c548d1 100644
--- a/.github/workflows/reusable-native-tests.yml
+++ b/.github/workflows/reusable-native-tests.yml
@@ -17,6 +17,11 @@ jobs:
   graalvm-native-tests:
     if: "!inputs.skip-native-tests"
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-java-version:
+          - 22
+          - 23
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - id: read-java
@@ -24,7 +29,7 @@ jobs:
       - uses: graalvm/setup-graalvm@01ed653ac833fe80569f1ef9f25585ba2811baab # v1.3.3.1
         with:
           version: "latest"
-          java-version: "${{ steps.read-java.outputs.version }}"
+          java-version: ${{ matrix.test-java-version }}
           components: "native-image"
       - name: Running test
         env:
diff --git a/instrumentation-api/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-instrumentation-api/native-image.properties b/instrumentation-api/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-instrumentation-api/native-image.properties
deleted file mode 100644
index 83efd36a27e8..000000000000
--- a/instrumentation-api/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-instrumentation-api/native-image.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-Args=\
-  --initialize-at-build-time=io.opentelemetry.instrumentation.api.internal.cache.concurrentlinkedhashmap.ConcurrentLinkedHashMap \
-  --initialize-at-build-time=io.opentelemetry.instrumentation.api.internal.cache.MapBackedCache \
-  --initialize-at-build-time=io.opentelemetry.api.internal.InternalAttributeKeyImpl
diff --git a/instrumentation/logback/logback-appender-1.0/library/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-logback-appender-1.0/native-image.properties b/instrumentation/logback/logback-appender-1.0/library/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-logback-appender-1.0/native-image.properties
deleted file mode 100644
index e393b0676ffb..000000000000
--- a/instrumentation/logback/logback-appender-1.0/library/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-logback-appender-1.0/native-image.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Args=\
-  --initialize-at-build-time=io.opentelemetry.instrumentation.logback.appender.v1_0.internal.LoggingEventMapper
diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
index c4f9c6413c82..2bdbfb5b5b30 100644
--- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
+++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
@@ -214,12 +214,13 @@ void shouldSendTelemetry() {
 
     // JMX based metrics - test one per JMX bean
     List<String> jmxMetrics =
-        new ArrayList<>(
-            Arrays.asList(
-                "jvm.thread.count",
-                "jvm.memory.used",
-                "jvm.system.cpu.load_1m",
-                "jvm.memory.init"));
+        new ArrayList<>(Arrays.asList("jvm.thread.count", "jvm.memory.used", "jvm.memory.init"));
+
+    double javaVersion = Double.parseDouble(System.getProperty("java.specification.version"));
+    // See https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/13503
+    if (javaVersion < 23) {
+      jmxMetrics.add("jvm.system.cpu.load_1m");
+    }
 
     boolean noNative = System.getProperty("org.graalvm.nativeimage.imagecode") == null;
     if (noNative) {