diff --git a/redisson/pom.xml b/redisson/pom.xml
index 01cd89f03..13a8a57aa 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -429,14 +429,20 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>2.22.2</version>
                 <configuration>
-                    <properties>
-                        <property>
-                            <name>listener</name>
-                            <value>org.redisson.RedissonTestRunListener</value>
-                        </property>
-                    </properties>
+                    <includes>
+                      <include>org/redisson/executor/**</include>
+                      <include>org/redisson/executor/transaction/**</include>
+                      <include>org/redisson/executor/rx/**</include>
+                    </includes>
+                    <parallelTestsTimeoutInSeconds>650</parallelTestsTimeoutInSeconds>
+		    <parallelTestsTimeoutForcedInSeconds>650</parallelTestsTimeoutForcedInSeconds>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <argLine>
+                       -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/1.46/jmockit-1.46.jar
+                    </argLine>
                 </configuration>
             </plugin>
 
diff --git a/redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java b/redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java
index 29fadf1a4..3104c52eb 100644
--- a/redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java
+++ b/redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java
@@ -221,7 +221,7 @@ public class LocalCachedMapOptions<K, V> extends MapOptions<K, V> {
     }
     
     /**
-     * Defines eviction policy.
+     * Defines local cache eviction policy.
      * 
      * @param evictionPolicy
      *         <p><code>LRU</code> - uses local cache with LRU (least recently used) eviction policy.