diff --git a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java
index 9e666c236..d9c03eb16 100644
--- a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java
+++ b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java
@@ -64,7 +64,7 @@ public void onLoad(NativeImageConfiguration config) {
         );
 
         if (getMajorJDKVersion() >= 21) {
-            /* new with simulated class initialization */
+            /* new with --strict-image-heap */
             config.initializeAtBuildTime(
                     "org.junit.platform.engine.support.descriptor.ClassSource",
                     "org.junit.platform.engine.support.descriptor.MethodSource",
@@ -75,15 +75,21 @@ public void onLoad(NativeImageConfiguration config) {
                     "org.junit.platform.launcher.core.DefaultLauncher",
                     "org.junit.platform.launcher.core.DefaultLauncherConfig",
                     "org.junit.platform.launcher.core.EngineExecutionOrchestrator",
+                    "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$1",
                     "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$2",
                     "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$3",
+                    "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$4",
                     "org.junit.platform.launcher.core.LauncherDiscoveryResult",
                     "org.junit.platform.launcher.core.LauncherListenerRegistry",
                     "org.junit.platform.launcher.core.ListenerRegistry",
                     "org.junit.platform.launcher.core.SessionPerRequestLauncher",
                     "org.junit.platform.launcher.LauncherSessionListener$1",
                     "org.junit.platform.launcher.listeners.UniqueIdTrackingListener",
-                    "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.api.DocumentWriter$1"
+                    "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.api.DocumentWriter$1",
+                    "org.junit.platform.suite.engine.SuiteEngineDescriptor",
+                    "org.junit.platform.suite.engine.SuiteLauncher",
+                    "org.junit.platform.suite.engine.SuiteTestDescriptor",
+                    "org.junit.platform.suite.engine.SuiteTestEngine"
             );
         }
 
diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc
index 2f34078dc..23f732fb1 100644
--- a/docs/src/docs/asciidoc/index.adoc
+++ b/docs/src/docs/asciidoc/index.adoc
@@ -19,6 +19,11 @@ If you are using alternative build systems, see <<alternative-build-systems.adoc
 [[changelog]]
 == Changelog
 
+=== Release 0.10.1
+
+- Mark additional JUnit 5 types for build-time initialization for compatibility with Native Image's `--strict-image-heap` option.
+
+
 === Release 0.10.0
 
 - Update version of GraalVM dependency to 22.3.5