diff --git a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java b/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
index f7021092c2..fc966b8d5d 100644
--- a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
+++ b/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
@@ -23,7 +23,6 @@ import akka.japi.Function;
 //#import-function
 
 //#import-timeout
-import akka.util.Duration;
 import akka.util.Timeout;
 import static java.util.concurrent.TimeUnit.SECONDS;
 //#import-timeout
@@ -86,7 +85,7 @@ public class AgentDocTest {
     //#send-off
 
     //#read-await
-    Integer result = agent.await(new Timeout(Duration.create(5, SECONDS)));
+    Integer result = agent.await(new Timeout(5, SECONDS));
     //#read-await
 
     assertEquals(result, new Integer(14));
diff --git a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java b/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java
index 090d336b37..7ad2c62cc0 100644
--- a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java
+++ b/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java
@@ -13,7 +13,7 @@ import akka.dispatch.Await;
 import akka.transactor.Coordinated;
 import akka.util.Duration;
 import akka.util.Timeout;
-import java.util.concurrent.TimeUnit;
+import static java.util.concurrent.TimeUnit.SECONDS;
 //#imports
 
 public class TransactorDocTest {
@@ -26,7 +26,7 @@ public class TransactorDocTest {
         ActorRef counter1 = system.actorOf(new Props().withCreator(CoordinatedCounter.class));
         ActorRef counter2 = system.actorOf(new Props().withCreator(CoordinatedCounter.class));
 
-        Timeout timeout = new Timeout(Duration.create(5, TimeUnit.SECONDS));
+        Timeout timeout = new Timeout(5, SECONDS);
 
         counter1.tell(new Coordinated(new Increment(counter2), timeout));
 
@@ -41,7 +41,7 @@ public class TransactorDocTest {
     @Test
     public void coordinatedApi() {
         //#create-coordinated
-        Timeout timeout = new Timeout(Duration.create(5, TimeUnit.SECONDS));
+        Timeout timeout = new Timeout(5, SECONDS);
         Coordinated coordinated = new Coordinated(timeout);
         //#create-coordinated
 
@@ -66,7 +66,7 @@ public class TransactorDocTest {
         ActorSystem system = ActorSystem.create("CounterTransactor");
         ActorRef counter = system.actorOf(new Props().withCreator(Counter.class));
 
-        Timeout timeout = new Timeout(Duration.create(5, TimeUnit.SECONDS));
+        Timeout timeout = new Timeout(5, SECONDS);
         Coordinated coordinated = new Coordinated(timeout);
         counter.tell(coordinated.coordinate(new Increment()));
         coordinated.await();
@@ -83,7 +83,7 @@ public class TransactorDocTest {
         ActorRef friend = system.actorOf(new Props().withCreator(Counter.class));
         ActorRef friendlyCounter = system.actorOf(new Props().withCreator(FriendlyCounter.class));
 
-        Timeout timeout = new Timeout(Duration.create(5, TimeUnit.SECONDS));
+        Timeout timeout = new Timeout(5, SECONDS);
         Coordinated coordinated = new Coordinated(timeout);
         friendlyCounter.tell(coordinated.coordinate(new Increment(friend)));
         coordinated.await();
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
index 2ad814740d..591b8f2a48 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
@@ -22,7 +22,6 @@ import akka.testkit.AkkaSpec;
 import akka.testkit.EventFilter;
 import akka.testkit.ErrorFilter;
 import akka.testkit.TestEvent;
-import akka.util.Duration;
 import akka.util.Timeout;
 
 import java.util.Arrays;
@@ -54,7 +53,7 @@ public class UntypedCoordinatedIncrementTest {
   int numCounters = 3;
   int timeoutSeconds = 5;
 
-  Timeout timeout = new Timeout(Duration.create(timeoutSeconds, TimeUnit.SECONDS));
+  Timeout timeout = new Timeout(timeoutSeconds, TimeUnit.SECONDS);
 
   @Before
   public void initialise() {
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
index 56b12ef74b..aa83fe0d4f 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
@@ -22,7 +22,6 @@ import akka.testkit.AkkaSpec;
 import akka.testkit.EventFilter;
 import akka.testkit.ErrorFilter;
 import akka.testkit.TestEvent;
-import akka.util.Duration;
 import akka.util.Timeout;
 
 import java.util.Arrays;
@@ -55,7 +54,7 @@ public class UntypedTransactorTest {
   int numCounters = 3;
   int timeoutSeconds = 5;
 
-  Timeout timeout = new Timeout(Duration.create(timeoutSeconds, TimeUnit.SECONDS));
+  Timeout timeout = new Timeout(timeoutSeconds, TimeUnit.SECONDS);
 
   @Before
   public void initialise() {