diff --git a/tools/test/scenarios/net-host-intent.xml b/tools/test/scenarios/net-host-intent.xml
new file mode 100644
index 0000000..d256a58
--- /dev/null
+++ b/tools/test/scenarios/net-host-intent.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="net-host-intent" description="Network host intent connectivity test">
+    <!-- TODO: parametrize this via recipes -->
+    <group name="Host-Intent-Connectivity">
+        <step name="Uninstall-Reactive-Forwarding"
+              exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
+
+        <step name="Find-Host-1" requires="^"
+              exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect ."/>
+        <step name="Find-Host-2" requires="^"
+              exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect ."/>
+
+        <step name="Create-Intent" requires="^"
+              exec="onos ${OCI} add-host-intent 00:00:00:00:00:01/-1 00:00:00:00:00:04/-1"/>
+
+        <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Host-Intent"/>
+        <dependency name="Host-Intent.Net-Link-Down-Up" requires="Create-Intent"/>
+
+        <step name="Remove-Intent" requires="Host-Intent.Net-Link-Down-Up"
+              exec="onos ${OCI} remove-intent --purge"/>
+    </group>
+</scenario>
\ No newline at end of file
diff --git a/tools/test/scenarios/net-link-up-down.xml b/tools/test/scenarios/net-link-down-up.xml
similarity index 94%
rename from tools/test/scenarios/net-link-up-down.xml
rename to tools/test/scenarios/net-link-down-up.xml
index f421227..fda756a 100644
--- a/tools/test/scenarios/net-link-up-down.xml
+++ b/tools/test/scenarios/net-link-down-up.xml
@@ -13,9 +13,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<scenario name="net-link-up-down" description="Network link up-down test">
+<scenario name="net-link-down-up" description="Network link up-down test">
     <!-- TODO: parametrize this via recipes -->
-    <group name="Net-Link-Up-Down">
+    <group name="Net-Link-Down-Up">
         <step name="Ping-1"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
         <step name="Link-1-Down" requires="Ping-1"
diff --git a/tools/test/scenarios/net-smoke.xml b/tools/test/scenarios/net-smoke.xml
index fec1652..87bd38c 100644
--- a/tools/test/scenarios/net-smoke.xml
+++ b/tools/test/scenarios/net-smoke.xml
@@ -17,13 +17,16 @@
     <group name="Net-Smoke">
         <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
 
-        <import file="${ONOS_SCENARIOS}/net-pingall.xml"/>
-        <dependency name="Net-Pingall" requires="Net-Setup"/>
+        <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/>
 
-        <import file="${ONOS_SCENARIOS}/net-link-up-down.xml"/>
-        <dependency name="Net-Link-Up-Down" requires="~Net-Pingall"/>
+        <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="~Reactive-Forwarding.Net-Pingall"/>
+
+        <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
+        <dependency name="Host-Intent-Connectivity" requires="~Reactive-Forwarding.Net-Link-Down-Up"/>
 
         <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
-        <dependency name="Net-Teardown" requires="~Net-Link-Up-Down"/>
+        <dependency name="Net-Teardown" requires="~Host-Intent-Connectivity"/>
     </group>
 </scenario>
\ No newline at end of file