diff --git a/client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java b/client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java
index 6dc145a3cf..d8164901a1 100644
--- a/client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java
+++ b/client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java
@@ -42,7 +42,7 @@ public class TelemetrySenderTest extends AbstractAmqpAdapterClientDownstreamSend
     private static final String ADDRESS = TelemetryConstants.TELEMETRY_ENDPOINT + "/" + TENANT_ID + "/" + DEVICE_ID;
 
     /**
-     * Verifies that the message created by {@link TelemetrySender#send(String, byte[], String, Map)} conforms to the
+     * Verifies that the message created by {@link TelemetrySender#send(String, byte[], String, java.util.Map)} conforms to the
      * expectations of the AMQP adapter.
      */
     @Test
@@ -60,7 +60,7 @@ public void testSendCreatesValidMessage() {
     }
 
     /**
-     * Verifies that the message created by {@link TelemetrySender#sendAndWaitForOutcome(String, byte[], String, Map)}
+     * Verifies that the message created by {@link TelemetrySender#sendAndWaitForOutcome(String, byte[], String, java.util.Map)}
      * conforms to the expectations of the AMQP adapter.
      *
      * @param ctx The test context to use for running asynchronous tests.
@@ -86,8 +86,8 @@ public void testSendAndWaitForOutcomeCreatesValidMessage(final VertxTestContext
     }
 
     /**
-     * Verifies that the message created by {@link TelemetrySender#send(String, byte[], String, Map)} conforms to the
-     * expectations of the AMQP adapter.
+     * Verifies that the message created by {@link TelemetrySender#send(String, byte[], String, java.util.Map)} conforms
+     * to the expectations of the AMQP adapter.
      */
     @Test
     public void testSendWithTracing() {
@@ -105,7 +105,7 @@ public void testSendWithTracing() {
     }
 
     /**
-     * Verifies that {@link TraceableTelemetrySender#sendAndWaitForOutcome(String, byte[], String, Map, SpanContext)}
+     * Verifies that {@link TraceableTelemetrySender#sendAndWaitForOutcome(String, byte[], String, java.util.Map, SpanContext)}
      * uses the given SpanContext.
      *
      * @param ctx The test context to use for running asynchronous tests.
diff --git a/clients/application-kafka/src/test/java/org/eclipse/hono/application/client/kafka/impl/KafkaBasedCommandSenderTest.java b/clients/application-kafka/src/test/java/org/eclipse/hono/application/client/kafka/impl/KafkaBasedCommandSenderTest.java
index 668c67ff10..0e573da127 100644
--- a/clients/application-kafka/src/test/java/org/eclipse/hono/application/client/kafka/impl/KafkaBasedCommandSenderTest.java
+++ b/clients/application-kafka/src/test/java/org/eclipse/hono/application/client/kafka/impl/KafkaBasedCommandSenderTest.java
@@ -230,7 +230,7 @@ public void testSendOneWayCommandSucceeds(final VertxTestContext ctx) {
 
     /**
      * Verifies that
-     * {@link org.eclipse.hono.application.client.CommandSender#sendCommand(String, String, String, String, Buffer, String, Map, Duration, SpanContext)}
+     * {@link org.eclipse.hono.application.client.CommandSender#sendCommand(String, String, String, String, Buffer, String, Map, Duration, io.opentracing.SpanContext)}
      * fails as the timeout is reached.
      *
      * @param ctx The vert.x test context.
diff --git a/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/producer/CachingKafkaProducerFactory.java b/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/producer/CachingKafkaProducerFactory.java
index b65c6ad421..0faa6e41dc 100644
--- a/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/producer/CachingKafkaProducerFactory.java
+++ b/clients/kafka-common/src/main/java/org/eclipse/hono/client/kafka/producer/CachingKafkaProducerFactory.java
@@ -43,9 +43,9 @@
  * <p>
  * Producers are closed and removed from the cache if they throw a {@link #isFatalError(Throwable) fatal exception}.
  * This is triggered by {@link KafkaProducer#exceptionHandler(Handler)} and run asynchronously after the
- * {@link io.vertx.kafka.client.producer.impl.KafkaWriteStreamImpl#send(ProducerRecord, Handler) send operation} has
- * finished. A following invocation of {@link #getOrCreateProducer(String, KafkaProducerConfigProperties)} will then
- * return a new instance.
+ * {@link io.vertx.kafka.client.producer.impl.KafkaWriteStreamImpl#send(org.apache.kafka.clients.producer.ProducerRecord, Handler)
+ * send operation} has finished. A following invocation of {@link #getOrCreateProducer(String, KafkaProducerConfigProperties)}
+ * will then return a new instance.
  *
  * @param <K> The type for the record key serialization.
  * @param <V> The type for the record value serialization.
diff --git a/clients/telemetry-amqp/src/test/java/org/eclipse/hono/client/telemetry/amqp/ProtonBasedDownstreamSenderTest.java b/clients/telemetry-amqp/src/test/java/org/eclipse/hono/client/telemetry/amqp/ProtonBasedDownstreamSenderTest.java
index b1a1b8f779..4d4290c84e 100644
--- a/clients/telemetry-amqp/src/test/java/org/eclipse/hono/client/telemetry/amqp/ProtonBasedDownstreamSenderTest.java
+++ b/clients/telemetry-amqp/src/test/java/org/eclipse/hono/client/telemetry/amqp/ProtonBasedDownstreamSenderTest.java
@@ -161,7 +161,7 @@ public void testSendEventMarksMessageAsDurable() {
 
     /**
      * Verifies that a TTL values in the <em>properties</em> parameter of
-     * {@link org.eclipse.hono.client.telemetry.EventSender#sendEvent(TenantObject, RegistrationAssertion, String, Buffer, Map, SpanContext)}
+     * {@link org.eclipse.hono.client.telemetry.EventSender#sendEvent(TenantObject, RegistrationAssertion, String, Buffer, Map, io.opentracing.SpanContext)}
      * are correctly taken as seconds and set as milliseconds at the message.
      */
     @Test
diff --git a/clients/telemetry-kafka/src/test/java/org/eclipse/hono/client/telemetry/kafka/KafkaBasedTelemetrySenderTest.java b/clients/telemetry-kafka/src/test/java/org/eclipse/hono/client/telemetry/kafka/KafkaBasedTelemetrySenderTest.java
index 81b7496ff3..5ade1bc816 100644
--- a/clients/telemetry-kafka/src/test/java/org/eclipse/hono/client/telemetry/kafka/KafkaBasedTelemetrySenderTest.java
+++ b/clients/telemetry-kafka/src/test/java/org/eclipse/hono/client/telemetry/kafka/KafkaBasedTelemetrySenderTest.java
@@ -143,7 +143,7 @@ public void testThatConstructorThrowsOnMissingParameter() {
 
     /**
      * Verifies that
-     * {@link KafkaBasedTelemetrySender#sendTelemetry(TenantObject, RegistrationAssertion, QoS, String, Buffer, Map, SpanContext)}
+     * {@link KafkaBasedTelemetrySender#sendTelemetry(TenantObject, RegistrationAssertion, QoS, String, Buffer, Map, io.opentracing.SpanContext)}
      * throws an NPE if a mandatory parameter is {@code null}.
      */
     @Test
diff --git a/service-base/src/main/java/org/eclipse/hono/service/http/WebSpanDecorator.java b/service-base/src/main/java/org/eclipse/hono/service/http/WebSpanDecorator.java
index ef910a40d0..43a8aafeb6 100644
--- a/service-base/src/main/java/org/eclipse/hono/service/http/WebSpanDecorator.java
+++ b/service-base/src/main/java/org/eclipse/hono/service/http/WebSpanDecorator.java
@@ -50,7 +50,7 @@ public interface WebSpanDecorator {
 
     /**
      * Decorate span when the response is known. This is effectively invoked in BodyEndHandler which is added to
-     * - {@link io.vertx.ext.web.RoutingContext#addBodyEndHandler(Handler)}
+     * - {@link io.vertx.ext.web.RoutingContext#addBodyEndHandler(io.vertx.core.Handler)}
      *
      * @param request server request
      * @param span server span
diff --git a/services/device-registry-base/src/test/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtilsTest.java b/services/device-registry-base/src/test/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtilsTest.java
index 3d72bca96b..fcc4c526d3 100644
--- a/services/device-registry-base/src/test/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtilsTest.java
+++ b/services/device-registry-base/src/test/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtilsTest.java
@@ -37,7 +37,7 @@
 public class DeviceRegistryUtilsTest {
 
     /**
-     * Verifies the conversion of a {@link Tenant} instance to a {@link TenantObject}.
+     * Verifies the conversion of a {@link Tenant} instance to a {@link org.eclipse.hono.util.TenantObject}.
      */
     @Test
     public void testTenantConversion() {
diff --git a/services/device-registry-file/src/test/java/org/eclipse/hono/deviceregistry/file/FileBasedDeviceManagementSearchDevicesTest.java b/services/device-registry-file/src/test/java/org/eclipse/hono/deviceregistry/file/FileBasedDeviceManagementSearchDevicesTest.java
index 1754547c87..46be67bbd3 100644
--- a/services/device-registry-file/src/test/java/org/eclipse/hono/deviceregistry/file/FileBasedDeviceManagementSearchDevicesTest.java
+++ b/services/device-registry-file/src/test/java/org/eclipse/hono/deviceregistry/file/FileBasedDeviceManagementSearchDevicesTest.java
@@ -47,7 +47,7 @@
 import io.vertx.junit5.VertxTestContext;
 
 /**
- * Tests for {@link FileBasedRegistrationService#searchDevices(String, int, int, List, List, Span)}.
+ * Tests for {@link FileBasedRegistrationService#searchDevices(String, int, int, List, List, io.opentracing.Span)}.
  */
 @ExtendWith(VertxExtension.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/tests/src/test/java/org/eclipse/hono/tests/GenericKafkaSender.java b/tests/src/test/java/org/eclipse/hono/tests/GenericKafkaSender.java
index f07943de47..d9c39173bb 100644
--- a/tests/src/test/java/org/eclipse/hono/tests/GenericKafkaSender.java
+++ b/tests/src/test/java/org/eclipse/hono/tests/GenericKafkaSender.java
@@ -56,7 +56,7 @@ public GenericKafkaSender(
      * <p>
      * The future will be succeeded if the message has been sent.
      * <p>
-     * The future will be failed with a {@link ServerErrorException} if the data could
+     * The future will be failed with a {@link org.eclipse.hono.client.ServerErrorException} if the data could
      * not be sent. The error code contained in the exception indicates the cause of the failure.
      * @throws NullPointerException if topic, tenantId, deviceId or properties are {@code null}.
      */
@@ -81,7 +81,7 @@ public Future<Void> sendAndWaitForOutcome(
      * <p>
      * The future will be succeeded if the message has been sent.
      * <p>
-     * The future will be failed with a {@link ServerErrorException} if the data could
+     * The future will be failed with a {@link org.eclipse.hono.client.ServerErrorException} if the data could
      * not be sent. The error code contained in the exception indicates the cause of the failure.
      * @throws NullPointerException if topic, tenantId, deviceId or headers are {@code null}.
      */