diff --git a/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala b/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala
index ca31f5086a..b55d59d85f 100644
--- a/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala
+++ b/akka-discovery/src/test/scala/doc/akka/discovery/CompileOnlySpec.scala
@@ -5,7 +5,6 @@
 package doc.akka.discovery
 
 import akka.actor.ActorSystem
-import akka.discovery.{ Discovery, Lookup, ServiceDiscovery }
 
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -14,18 +13,25 @@ import scala.concurrent.ExecutionContext.Implicits.global
 object CompileOnlySpec {
 
   //#loading
+  import akka.discovery.Discovery
+
   val system = ActorSystem()
   val serviceDiscovery = Discovery(system).discovery
   //#loading
 
   //#basic
+  import akka.discovery.Lookup
+
   serviceDiscovery.lookup(Lookup("akka.io"), 1.second)
   // Convenience for a Lookup with only a serviceName
   serviceDiscovery.lookup("akka.io", 1.second)
   //#basic
 
   //#full
-  val lookup: Future[ServiceDiscovery.Resolved] =
+  import akka.discovery.Lookup
+  import akka.discovery.ServiceDiscovery.Resolved
+
+  val lookup: Future[Resolved] =
     serviceDiscovery.lookup(Lookup("akka.io").withPortName("remoting").withProtocol("tcp"), 1.second)
   //#full