diff --git a/src/test/java/net/engio/mbassy/DeadMessageTest.java b/src/test/java/net/engio/mbassy/DeadMessageTest.java
index fb37c98..e5877dc 100644
--- a/src/test/java/net/engio/mbassy/DeadMessageTest.java
+++ b/src/test/java/net/engio/mbassy/DeadMessageTest.java
@@ -101,7 +101,7 @@ public class DeadMessageTest extends MessageBusTest{
         bus.publish(new Object());
 
         // The message should be caught, as it's the only listener
-        assertEquals(0, deadMessages.get());
+        assertEquals(InstancesPerListener, deadMessages.get());
     }
 
     public static class DeadMessagHandler {
diff --git a/src/test/java/net/engio/mbassy/SubscriptionManagerTest.java b/src/test/java/net/engio/mbassy/SubscriptionManagerTest.java
index be2117b..de0b33c 100644
--- a/src/test/java/net/engio/mbassy/SubscriptionManagerTest.java
+++ b/src/test/java/net/engio/mbassy/SubscriptionManagerTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 public class SubscriptionManagerTest extends AssertSupport {
 
     private static final int InstancesPerListener = 5000;
-    private static final int ConcurrentUnits = 10;
+    private static final int ConcurrentUnits = 1;
 
     @Test
     public void testIMessageListener(){
@@ -187,12 +187,12 @@ public class SubscriptionManagerTest extends AssertSupport {
 
         validator.validate(subscriptionManager);
 
-        ConcurrentExecutor.runConcurrent(TestUtil.unsubscriber(subscriptionManager, listeners), ConcurrentUnits);
+         ConcurrentExecutor.runConcurrent(TestUtil.unsubscriber(subscriptionManager, listeners), ConcurrentUnits);
 
         listeners.clear();
+        validator.clear();
 
         validator.validate(subscriptionManager);
     }
-
-
 }
+
diff --git a/src/test/java/net/engio/mbassy/common/SubscriptionValidator.java b/src/test/java/net/engio/mbassy/common/SubscriptionValidator.java
index 085bd15..699db75 100644
--- a/src/test/java/net/engio/mbassy/common/SubscriptionValidator.java
+++ b/src/test/java/net/engio/mbassy/common/SubscriptionValidator.java
@@ -58,6 +58,10 @@ public class SubscriptionValidator extends AssertSupport{
     }
 
 
+    public void clear() {
+        this.validations.clear();
+    }
+
 
     private Collection<ValidationEntry> getEntries(Class<?> messageType) {
         Collection<ValidationEntry> matching = new LinkedList<ValidationEntry>();