diff --git a/src/org/jgroups/protocols/Discovery.java b/src/org/jgroups/protocols/Discovery.java
index 4ede71ed0c4..1efbe49fa96 100644
--- a/src/org/jgroups/protocols/Discovery.java
+++ b/src/org/jgroups/protocols/Discovery.java
@@ -131,7 +131,7 @@ public void start() throws Exception {
     }
 
     public void stop() {
-        is_server=false;
+        is_server=is_coord=false;
         clearRequestFutures();
     }
 
diff --git a/tests/junit/org/jgroups/tests/SequencerOrderTest.java b/tests/junit/org/jgroups/tests/SequencerOrderTest.java
index 0f84a42bfae..34e0d281d48 100644
--- a/tests/junit/org/jgroups/tests/SequencerOrderTest.java
+++ b/tests/junit/org/jgroups/tests/SequencerOrderTest.java
@@ -81,10 +81,10 @@ public void testBroadcastSequence() throws Exception {
             sender.join(60000);
         System.out.println("Ok, senders have completed");
 
-        for(int i=0; i < 10; i++) {
+        for(int i=0; i < 50; i++) {
             if(r1.size() == EXPECTED_MSGS && r2.size() == EXPECTED_MSGS && r3.size() == EXPECTED_MSGS)
                 break;
-            Util.sleep(1000);
+            Util.sleep(200);
         }
 
         final List<String> l1=r1.getMsgs();
@@ -98,13 +98,14 @@ public void testBroadcastSequence() throws Exception {
 
     protected static void insertShuffle(JChannel... channels) throws Exception {
         for(JChannel ch: channels) {
-            SHUFFLE shuffle=new SHUFFLE();
-            shuffle.setDown(false);
-            shuffle.setUp(true);
-            shuffle.setMaxSize(10);
-            shuffle.setMaxTime(1000);
+            SHUFFLE shuffle=new SHUFFLE()
+              .setDown(false)
+              .setUp(true)
+              .setMaxSize(10)
+              .setMaxTime(1000);
             ch.getProtocolStack().insertProtocol(shuffle, ProtocolStack.Position.BELOW, NAKACK2.class);
-            shuffle.init(); // starts the timer
+            shuffle.init();
+            shuffle.start(); // starts the timer
         }
     }