diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
index 7602658a746..bd3fab1415c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
@@ -73,6 +73,9 @@ public class TestFastFail {
    */
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
+    // Just to prevent fastpath FIFO from picking calls up bypassing the queue.
+    TEST_UTIL.getConfiguration().set(
+      SimpleRpcScheduler.CALL_QUEUE_TYPE_CONF_KEY, "deadline");
     TEST_UTIL.startMiniCluster(SLAVES);
   }