diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index c08e8a4..cfe3ce9 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -21,8 +21,9 @@
     <import file="${ONOS_SCENARIOS}/dist-test.xml"/>
     <import file="${ONOS_SCENARIOS}/smoke-internal.xml"/>
     <import file="${ONOS_SCENARIOS}/yang-smoke.xml"/>
+    <!--
     <import file="${ONOS_SCENARIOS}/yang-live-compile.xml"/>
-
+    -->
     <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
     <dependency name="Net-Smoke" requires="Setup"/>
     <dependency name="Maps-Cli" requires="Setup"/>
@@ -31,8 +32,12 @@
     <dependency name="Netcfg" requires="Setup"/>
     <dependency name="Distributed-Primitives" requires="Setup"/>
     <dependency name="YANG-Smoke" requires="Setup,~Distributed-Primitives"/>
+
+    <!--  FIXME: Re-enable this scenario when problems locating features.xml file are resolved -->
+    <!--
     <dependency name="YANG-Live-Compile" requires="Setup,~YANG-Smoke"/>
+    -->
 
     <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
-    <dependency name="Wrapup" requires="~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg,~YANG-Smoke,~YANG-Live-Compile"/>
+    <dependency name="Wrapup" requires="~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg,~YANG-Smoke"/>
 </scenario>