diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index dd041575..9dab292d 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -34,8 +34,10 @@
 	</j:file>
 
     <echo>Creating ${basedir}/.classpath ...</echo>
-
-	<j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
+    <j:set var="maven-eclipse-junit"
+       value="${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit')}"/>
+	<echo>${pom.getPluginContext('maven-eclipse-plugin').getVariables()}</echo>
+    <j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
       <classpath>
 
         <j:if test="${sourcesPresent}">
@@ -44,6 +46,10 @@
 
         <j:if test="${unitTestSourcesPresent}">
           <classpathentry kind="src" path="${pom.build.unitTestSourceDirectory}"/>
+	      
+	      <j:if test="${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit') != ''}">
+	        <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-${pom.getPluginContext('maven-eclipse-plugin').getVariable('maven.eclipse.junit')}.jar"/>
+          </j:if>
         </j:if>
 
         <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
diff --git a/eclipse/plugin.properties b/eclipse/plugin.properties
index faf5c9c9..cd81e772 100644
--- a/eclipse/plugin.properties
+++ b/eclipse/plugin.properties
@@ -8,3 +8,4 @@
 # This accepts two values: 'all' for all the goals, 
 # and 'plugins' to generate only the plugins' default goals.
 maven.eclipse.goals = plugins
+maven.eclipse.junit = 3.8.1
\ No newline at end of file
diff --git a/eclipse/xdocs/properties.xml b/eclipse/xdocs/properties.xml
index a9ab1400..8eb552cd 100644
--- a/eclipse/xdocs/properties.xml
+++ b/eclipse/xdocs/properties.xml
@@ -29,6 +29,15 @@
             </p>
           </td>
         </tr>
+        <tr>
+          <td>maven.eclipse.junit</td>
+          <td>Yes (default=3.8.1)</td>
+          <td>
+			The version of JUnit you want added to your project. If this
+			property is set to an empty string, JUnit will not be added to your 
+			build classpath.
+          </td>
+        </tr>
       </table>
 	  <p>
 		Note that you will need to defined a <code>MAVEN_REPO</code> Java