diff --git a/src/test/setup/cord-test.sh b/src/test/setup/cord-test.sh
index 0cc65e6..5448a35 100755
--- a/src/test/setup/cord-test.sh
+++ b/src/test/setup/cord-test.sh
@@ -19,7 +19,7 @@
     for p in 8181 8101 9876 6653 6633; do
         port_str="$port_str -p $p:$p/tcp"
     done
-    ONOS_APPS="drivers,openflow,proxyarp,mobility,fwd,aaa,igmp"
+    ONOS_APPS="drivers,openflow,proxyarp,aaa,igmp"
     local cnt=`docker run -itd $port_str -e ONOS_APPS=${ONOS_APPS} $image /bin/bash`
     local ipaddr
     ipaddr=`docker inspect -f '{{.NetworkSettings.IPAddress}}' $cnt`
diff --git a/src/test/setup/of-bridge-template.sh b/src/test/setup/of-bridge-template.sh
index 2b602c9..1be9a4c 100755
--- a/src/test/setup/of-bridge-template.sh
+++ b/src/test/setup/of-bridge-template.sh
@@ -8,7 +8,7 @@
   controller="%%CONTROLLER%%"
 fi
 service openvswitch-switch restart
-num_ports=8
+num_ports=200
 ports=$(($num_ports-1))
 for vports in $(seq 0 2 $ports); do
    echo "Deleting veth$vports"
@@ -22,7 +22,7 @@
 echo "Configuring ovs bridge $bridge"
 ovs-vsctl del-br $bridge
 ovs-vsctl add-br $bridge
-for i in $(seq 1 2 7); do
+for i in $(seq 1 2 $ports); do
   ovs-vsctl add-port $bridge veth$i
 done
 my_ip=`ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d":" -f2 |cut -d" " -f1`