diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index 94553f3c8a2e318d07ddaadc0377fe921825fac9..fd373279e85f151de765bd4c5cfc7af5de3fac68 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -1138,12 +1138,14 @@ public class ControllerTest extends FloodlightTestCase
         // Make sure controller attempts to reset switch master
         expect(sw.getAttribute("supportsNxRole")).andReturn(true).anyTimes();
         expect(sw.getNextTransactionId()).andReturn(0).anyTimes();
+        sw.write(EasyMock.<List<OFMessage>> anyObject(),
+                 (FloodlightContext)anyObject());
 
         // test
         replay(sw, lock);
         chdlr.processOFMessage(error);
         // Verify there is a pending role change request
-        assertTrue(controller.roleChanger.pendingTasks.poll() != null);
+        assertTrue(controller.roleChanger.pendingTasks.peek() != null);
    }
 
     // Helper function.