diff --git a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFsmActorTest.java b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFsmActorTest.java
index 9f3f5361da..b34065dddc 100644
--- a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFsmActorTest.java
+++ b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFsmActorTest.java
@@ -124,7 +124,7 @@ public class AbstractPersistentFsmActorTest {
             FSM.Transition stateTransition = expectMsgClass(FSM.Transition.class);
             assertTransition(stateTransition, fsmRef, UserState.LOOKING_AROUND, UserState.SHOPPING);
 
-            new Within(duration("0.9 seconds"), duration("1.1 seconds")) {
+            new Within(duration("0.9 seconds"), duration("1.9 seconds")) {
                 @Override
                 protected void run() {
                     FSM.Transition stateTransition = expectMsgClass(FSM.Transition.class);
@@ -132,7 +132,7 @@ public class AbstractPersistentFsmActorTest {
                 }
             };
 
-            new Within(duration("1.9 seconds"), duration("2.1 seconds")) {
+            new Within(duration("1.9 seconds"), duration("2.9 seconds")) {
                 @Override
                 protected void run() {
                     expectTerminated(fsmRef);
@@ -310,7 +310,7 @@ public class AbstractPersistentFsmActorTest {
             currentState = expectMsgClass(akka.persistence.fsm.FSM.CurrentState.class);
             assertEquals(currentState.state(), UserState.SHOPPING);
 
-            new Within(duration("0.9 seconds"), duration("1.1 seconds")) {
+            new Within(duration("0.9 seconds"), duration("1.9 seconds")) {
                 @Override
                 protected void run() {
                     FSM.Transition stateTransition = expectMsgClass(FSM.Transition.class);
@@ -329,7 +329,7 @@ public class AbstractPersistentFsmActorTest {
             currentState = expectMsgClass(akka.persistence.fsm.FSM.CurrentState.class);
             assertEquals(currentState.state(), UserState.INACTIVE);
 
-            new Within(duration("1.9 seconds"), duration("2.1 seconds")) {
+            new Within(duration("1.9 seconds"), duration("2.9 seconds")) {
                 @Override
                 protected void run() {
                     expectTerminated(recoveredFsmRef2);
diff --git a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMActorSpec.scala b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMActorSpec.scala
index 2d400c61a3..1340beee9d 100644
--- a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMActorSpec.scala
+++ b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMActorSpec.scala
@@ -59,7 +59,7 @@ abstract class PersistentFSMActorSpec(config: Config) extends PersistenceSpec(co
       expectTerminated(fsmRef)
     }
 
-    "function as a regular FSM on state timeout" in {
+    "function as a regular FSM on state timeout" taggedAs TimingTest in {
       val persistenceId = name
       val fsmRef = system.actorOf(WebStoreCustomerFSMActor.props(persistenceId, dummyReportActorRef))
 
@@ -73,11 +73,11 @@ abstract class PersistentFSMActorSpec(config: Config) extends PersistenceSpec(co
       expectMsg(CurrentState(fsmRef, LookingAround))
       expectMsg(Transition(fsmRef, LookingAround, Shopping))
 
-      within(0.9 seconds, 1.1 seconds) {
+      within(0.9 seconds, 1.9 seconds) {
         expectMsg(Transition(fsmRef, Shopping, Inactive))
       }
 
-      within(1.9 seconds, 2.1 seconds) {
+      within(1.9 seconds, 2.9 seconds) {
         expectTerminated(fsmRef)
       }
     }
@@ -181,7 +181,7 @@ abstract class PersistentFSMActorSpec(config: Config) extends PersistenceSpec(co
       expectTerminated(fsmRef)
     }
 
-    "recover successfully with correct state timeout" in {
+    "recover successfully with correct state timeout" taggedAs TimingTest in {
       val persistenceId = name
       val fsmRef = system.actorOf(WebStoreCustomerFSMActor.props(persistenceId, dummyReportActorRef))
 
@@ -205,7 +205,7 @@ abstract class PersistentFSMActorSpec(config: Config) extends PersistenceSpec(co
 
       expectMsg(CurrentState(recoveredFsmRef, Shopping))
 
-      within(0.9 seconds, 1.1 seconds) {
+      within(0.9 seconds, 1.9 seconds) {
         expectMsg(Transition(recoveredFsmRef, Shopping, Inactive))
       }
 
@@ -219,7 +219,7 @@ abstract class PersistentFSMActorSpec(config: Config) extends PersistenceSpec(co
 
       expectMsg(CurrentState(recoveredFsmRef, Inactive))
 
-      within(1.9 seconds, 2.1 seconds) {
+      within(1.9 seconds, 2.9 seconds) {
         expectTerminated(recoveredFsmRef)
       }
     }