diff --git a/build.gradle b/build.gradle
index b3e96b265b5..c1c031f2757 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,6 +67,14 @@ subprojects {
         }
     }
 
+    // Ensure that Javadoc generation is always tested
+    check.dependsOn(javadoc)
+
+    javadoc {
+        dependsOn delombok
+        source = delombok.outputs
+    }
+
     shadowJar {
         configurations = []
         classifier = null
diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
index 8f0ef0ebcc1..ea25bf629e6 100644
--- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
+++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java
@@ -359,9 +359,9 @@ public RabbitMQContainer withRabbitMQConfig(MountableFile rabbitMQConf) {
     /**
      * Overwrites the default RabbitMQ configuration file with the supplied one.
      *
-     * This function doesn't work with RabbitMQ < 3.7.
+     * This function doesn't work with RabbitMQ &lt; 3.7.
      *
-     * This function and the Sysctl format is recommended for RabbitMQ >= 3.7
+     * This function and the Sysctl format is recommended for RabbitMQ &gt;= 3.7
      *
      * @param rabbitMQConf The rabbitmq.config file to use (in sysctl format, don't forget empty line in the end of file)
      * @return This container.