2 files changed, 10 insertions, 7 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/plugin.xml
index 364e7dd70..8d7835fb7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/plugin.xml
@@ -20,7 +20,10 @@
             handlerId="org.eclipse.tcf.te.tests.handler1"
             id="org.eclipse.tcf.te.tests.binding1">
             <enablement>
-               <instanceof value="org.eclipse.tcf.te.tests.CoreTestCase"/>
+               <or>
+                  <instanceof value="org.eclipse.tcf.te.tests.CoreTestCase"/>
+                  <instanceof value="org.eclipse.tcf.te.tests.interfaces.IInterruptCondition"/>
+               </or>
             </enablement>
       </binding>
       
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/statushandler/StatusHandlerTestCase.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/statushandler/StatusHandlerTestCase.java
index 33f45de20..8b507bb7d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/statushandler/StatusHandlerTestCase.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/statushandler/StatusHandlerTestCase.java
@@ -15,10 +15,10 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.tcf.te.tests.CoreTestCase;
-import org.eclipse.tcf.te.tests.interfaces.IInterruptCondition;
 import org.eclipse.tcf.te.runtime.statushandler.StatusHandlerManager;
 import org.eclipse.tcf.te.runtime.statushandler.interfaces.IStatusHandler;
+import org.eclipse.tcf.te.tests.CoreTestCase;
+import org.eclipse.tcf.te.tests.interfaces.IInterruptCondition;
 
 /**
  * Status handler test cases.
@@ -71,8 +71,8 @@ public class StatusHandlerTestCase extends CoreTestCase {
 			handlerIds.add(handler.getId());
 		}
 
-		assertTrue("Global enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler1")); //$NON-NLS-1$ //$NON-NLS-2$
-		assertFalse("Context enabled test status handler is active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler2")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertTrue("Test case enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler1")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertFalse("Interrupt condition enabled test status handler is active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler2")); //$NON-NLS-1$ //$NON-NLS-2$
 
 		handlerIds.clear();
 
@@ -93,7 +93,7 @@ public class StatusHandlerTestCase extends CoreTestCase {
 			handlerIds.add(handler.getId());
 		}
 
-		assertTrue("Global enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler1")); //$NON-NLS-1$ //$NON-NLS-2$
-		assertTrue("Context enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler2")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertTrue("Test case enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler1")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertTrue("Interrupt condition enabled test status handler not active.", handlerIds.contains("org.eclipse.tcf.te.tests.handler2")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }