diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
index 26b97051a2..4a30856718 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_1/ActorHierarchyExperiments.java
@@ -4,13 +4,15 @@
 
 package jdocs.typed.tutorial_1;
 
+/*
+//#print-refs
+package com.example
+
+//#print-refs
+*/
+
 import akka.actor.typed.PreRestart;
 import akka.actor.typed.SupervisorStrategy;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
-
-import akka.actor.testkit.typed.javadsl.TestKitJunitResource;
 import akka.actor.typed.PostStop;
 
 // #print-refs
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
index 249ca3d9f5..1bb44698f3 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotMain.java
@@ -4,6 +4,13 @@
 
 package jdocs.typed.tutorial_2;
 
+/*
+//#iot-app
+package com.example;
+
+//#iot-app
+*/
+
 // #iot-app
 import akka.actor.typed.ActorSystem;
 
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
index cd16da9959..81f6b43852 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_2/IotSupervisor.java
@@ -4,6 +4,13 @@
 
 package jdocs.typed.tutorial_2;
 
+/*
+//#iot-supervisor
+package com.example;
+
+//#iot-supervisor
+*/
+
 // #iot-supervisor
 import akka.actor.typed.Behavior;
 import akka.actor.typed.PostStop;
diff --git a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
index 0dbab6e77e..6959205cab 100644
--- a/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
+++ b/akka-docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
@@ -4,11 +4,17 @@
 
 package jdocs.typed.tutorial_3.inprogress1;
 
-import akka.actor.typed.ActorRef;
+/*
+//#read-protocol-1
+package com.example;
 
-import java.util.Optional;
+//#read-protocol-1
+*/
 
 // #read-protocol-1
+import akka.actor.typed.ActorRef;
+import java.util.Optional;
+
 public class Device {
 
   public interface Command {}
diff --git a/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala b/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
index a17c22b1fa..86dc7cd592 100644
--- a/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_1/ActorHierarchyExperiments.scala
@@ -4,6 +4,13 @@
 
 package typed.tutorial_1
 
+/*
+//#print-refs
+package com.example
+
+//#print-refs
+ */
+
 import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import akka.actor.typed.PostStop
diff --git a/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala b/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
index e7a149d12f..67e32f53e7 100644
--- a/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_2/IotApp.scala
@@ -4,6 +4,13 @@
 
 package typed.tutorial_2
 
+/*
+//#iot-app
+package com.example
+
+//#iot-app
+ */
+
 //#iot-app
 import akka.actor.typed.ActorSystem
 
diff --git a/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala b/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
index 0525797dac..cca550df5a 100644
--- a/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_2/IotSupervisor.scala
@@ -4,6 +4,13 @@
 
 package typed.tutorial_2
 
+/*
+//#iot-supervisor
+package com.example
+
+//#iot-supervisor
+ */
+
 //#iot-supervisor
 import akka.actor.typed.Behavior
 import akka.actor.typed.PostStop
diff --git a/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala b/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
index 0bd5994fde..1455e0ac4f 100644
--- a/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
+++ b/akka-docs/src/test/scala/typed/tutorial_3/DeviceInProgress.scala
@@ -4,6 +4,13 @@
 
 package typed.tutorial_3
 
+/*
+//#read-protocol-1
+package com.example
+
+//#read-protocol-1
+ */
+
 import akka.actor.typed.PostStop
 import akka.actor.typed.Signal