diff --git a/test/plugin.jelly b/test/plugin.jelly
index 89310b3b..241ba76a 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -148,6 +148,9 @@
         <j:if test="${context.getVariable('maven.junit.jvm') != null}">
           <setProperty name="jvm" value="${maven.junit.jvm}" />
         </j:if>
+        <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+          <setProperty name="timeout" value="${maven.junit.timeout}" />
+        </j:if>
         <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
           <setProperty name="dir" value="${maven.junit.dir}" />
         </j:if>
@@ -278,6 +281,9 @@
             <j:if test="${context.getVariable('maven.junit.jvm') != null}">
               <setProperty name="jvm" value="${maven.junit.jvm}" />
             </j:if>
+            <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+              <setProperty name="timeout" value="${maven.junit.timeout}" />
+            </j:if>
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
@@ -368,6 +374,9 @@
             <j:if test="${context.getVariable('maven.junit.jvm') != null}">
               <setProperty name="jvm" value="${maven.junit.jvm}" />
             </j:if>
+            <j:if test="${context.getVariable('maven.junit.timeout') != null}">
+              <setProperty name="timeout" value="${maven.junit.timeout}" />
+            </j:if>
             <sysproperty key="basedir" value="${basedir}"/>
             <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize>
             <j:forEach var="someProperty" items="${listOfProperties}">
diff --git a/test/plugin.properties b/test/plugin.properties
index 88a71d69..fc32ef89 100644
--- a/test/plugin.properties
+++ b/test/plugin.properties
@@ -27,6 +27,7 @@ maven.junit.format=brief
 maven.junit.jvmargs=
 maven.junit.envvars=
 maven.junit.jvm=
+#maven.junit.timeout=
 maven.junit.printSummary=true
 maven.junit.usefile = true
 
diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml
index a444302c..f018d433 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPTEST-10">Add timeouts to the test plugin, new property <code>maven.junit.timeout</code>.</action>
       <action dev="ltheussl" type="add" issue="MPTEST-58" due-to="Mauro Botelho">Add ability to fail the build on test errors, new property <code>maven.test.error.ignore</code>.</action>
       <action dev="ltheussl" type="fix" issue="MPTEST-46">Do not execute <code>test:test-resources</code> and <code>test:compile</code> unless tests will be run.</action>
       <action dev="ltheussl" type="fix" issue="MPTEST-59"><code>test:single</code> should ignore <code>maven.test.skip=true</code>.</action>
diff --git a/test/xdocs/properties.xml b/test/xdocs/properties.xml
index d84e0f17..d4ff553b 100644
--- a/test/xdocs/properties.xml
+++ b/test/xdocs/properties.xml
@@ -98,6 +98,14 @@
             If maven.junit.fork is not true, this is ignored.
           </td>
         </tr>
+        <tr>
+          <td>maven.junit.timeout</td>
+          <td>Yes</td>
+          <td>
+            Cancel the individual tests if they don't finish in the given time
+            (measured in milliseconds). Ignored if fork is disabled.
+          </td>
+        </tr>
         <tr>
           <td>maven.test.dest</td>
           <td>Yes</td>