diff --git a/CHANGES.md b/CHANGES.md
index 3114189c3..3476c384c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+Airbase 154
+* Fix javadoc building when `air.compiler.enable-preview` is set
+
 Airbase 153
 * Dependency updates:
   - OpenTelemetry 1.36.0 (from 1.35.0)
diff --git a/airbase/pom.xml b/airbase/pom.xml
index db543a603..7d881ba41 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -856,6 +856,7 @@
                         <encoding>${project.build.sourceEncoding}</encoding>
                         <maxmemory>${air.build.jvmsize}</maxmemory>
                         <doclint>${air.javadoc.lint}</doclint>
+                        <additionalOptions>${surefireEnablePreview}</additionalOptions>
                     </configuration>
                     <executions>
                         <execution>