azkaban-aplcache

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerYamlTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerYamlTest.java
index 6c608cc..8e043ac 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerYamlTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerYamlTest.java
@@ -26,6 +26,7 @@ import azkaban.project.Project;
 import azkaban.test.executions.ExecutionsTestUtil;
 import java.io.File;
 import java.util.HashMap;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class FlowRunnerYamlTest extends FlowRunnerTestBase {
@@ -56,6 +57,13 @@ public class FlowRunnerYamlTest extends FlowRunnerTestBase {
     assertFlowStatus(flow, Status.SUCCEEDED);
   }
 
+  /**
+   * There seems to be an actual race condition bug in the runtime code. See: issue #1921: Flaky
+   * test FlowRunnerTestYaml & issue #1311: Potential race condition between flowRunner thread and
+   * jetty killing thread. Disable this test until the potential bug is fixed or new DAG engine
+   * code is ready.
+   */
+  @Ignore
   @Test
   public void testKillBasicFlowWithoutEndNode() throws Exception {
     setUp(BASIC_FLOW_YAML_DIR, BASIC_FLOW_YAML_FILE);