diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly
index 0c18e092..29d7b56d 100644
--- a/eclipse/plugin.jelly
+++ b/eclipse/plugin.jelly
@@ -3,6 +3,8 @@
 <project xmlns:j="jelly:core"
 	xmlns:test="test">
 
+  <test:eclipse/>
+
   <!--==================================================================-->
   <!-- Generate Eclipse .project and .classpath files                   -->
   <!--==================================================================-->    
@@ -40,8 +42,8 @@
 	</j:file>
 
     <echo>Creating ${basedir}/.classpath ...</echo>
-    
-	<j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
+
+    <j:file name="${basedir}/.classpath" prettyPrint="true" xmlns="dummy">
       <classpath>
 
         <j:if test="${sourcesPresent}">
@@ -152,6 +154,16 @@
     	<j:set var="toDir" value="${maven.eclipse.workspace}/.metadata/.plugins/org.eclipse.ui.externaltools/" />
     	<copy file="${toolFile}" todir="${toDir}"/>
     </j:if>
+    
+    <j:if test='${ws == "X"}'>
+    	<echo>
+  Please set maven.eclipse.workspace to the location of your eclipse workspace.
+  Alternatively, copy 
+    ${maven.build.dir}/eclipse/externaltools.xml
+  to
+    [maven.eclipse.workspace]/.metadata/.plugins/org.eclipse.ui.externaltools/externaltools.xml
+		</echo>
+    </j:if>
 
   </goal>
 
diff --git a/test/plugin.jelly b/test/plugin.jelly
index cceaf739..ad15a069 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -5,6 +5,15 @@
          xmlns:resources="resources"
          xmlns:define="jelly:define">
   
+  <define:taglib uri="test">
+    <define:tag name="eclipse">
+    	<!-- The eclipse plugin requires access to the test plugin.
+    		 Using this tag forces the test plugin to be loaded into the
+    		 eclipse plugin -->
+    </define:tag>
+  </define:taglib>
+  
+  
   <goal name="test" 
         description="Test the application"
         prereqs="test:test"/>
@@ -260,6 +269,10 @@
 		
 		<attainGoal name="test:match"/>
   </goal>
+  
+  <goal name="test:eclipse">
+  		<echo>Used by eclipse to drag in test plugin context</echo>
+  </goal>
 		        
   <!-- ================================================================== -->
   <!-- T E S T  R E S O U R C E S                                         -->