diff --git a/tools/test/cells/101 b/tools/test/cells/101
deleted file mode 100644
index df45cb6..0000000
--- a/tools/test/cells/101
+++ /dev/null
@@ -1,11 +0,0 @@
-# Developer cell
-
-export ONOS_NIC="10.128.11.*"
-export OCN="10.128.11.100"
-export OCT="10.128.11.101"
-
-export OC1="10.128.11.101"
-export OC2="10.128.11.102"
-export OC3="10.128.11.103"
-export ONOS_USE_SSH=true
-export ONOS_APPS=drivers,openflow,proxyarp,mobility,pathpainter
diff --git a/tools/test/cells/102 b/tools/test/cells/102
deleted file mode 100644
index 0a3e6f1..0000000
--- a/tools/test/cells/102
+++ /dev/null
@@ -1,11 +0,0 @@
-# Developer cell
-
-export ONOS_NIC="10.128.11.*"
-export OCN="10.128.11.200"
-export OCT="10.128.11.201"
-
-export OC1="10.128.11.201"
-export OC2="10.128.11.202"
-export OC3="10.128.11.203"
-export ONOS_USE_SSH=true
-export ONOS_APPS=drivers,openflow,proxyarp,mobility,pathpainter
diff --git a/utils/warden/src/main/java/org/onlab/warden/Warden.java b/utils/warden/src/main/java/org/onlab/warden/Warden.java
index 3f2caba..0469a7f 100644
--- a/utils/warden/src/main/java/org/onlab/warden/Warden.java
+++ b/utils/warden/src/main/java/org/onlab/warden/Warden.java
@@ -71,7 +71,7 @@
      */
     Warden() {
         random.setSeed(System.currentTimeMillis());
-        timer.schedule(new Reposessor(), MINUTE / 4, MINUTE);
+        timer.schedule(new Reposessor(), MINUTE / 4, MINUTE / 2);
     }
 
     /**
diff --git a/utils/warden/warden.initd b/utils/warden/warden.initd
new file mode 100755
index 0000000..d9380a4
--- /dev/null
+++ b/utils/warden/warden.initd
@@ -0,0 +1,82 @@
+#! /bin/bash
+# -----------------------------------------------------------------------------
+# init.d script to run ON.Lab test cell warden
+## -----------------------------------------------------------------------------
+### BEGIN INIT INFO
+# Provides:          warden
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: ON.Lab Test Cell Warden
+# Description:       Warden is a broker for sharing test cell infrastructure among ON.Lab developers.
+### END INIT INFO
+
+WARDEN_USER="sdn"
+WARDEN_HOME="/home/$WARDEN_USER/warden"
+WARDEN_VERSION="1.6.0-SNAPSHOT"
+DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+
+cd $WARDEN_HOME
+
+start () {
+    # Start warden if it's not already running
+    if ! status >/dev/null; then
+        echo "Starting Warden"
+        startwarden
+    else
+        echo "Warden is already running"
+    fi
+}
+
+startwarden () {
+    start-stop-daemon --signal INT --start --chuid $WARDEN_USER \
+        --pidfile $WARDEN_HOME/warden.pid --make-pidfile \
+        --background --chdir $WARDEN_HOME \
+        --exec /usr/bin/java -- -jar onlab-warden-$WARDEN_VERSION.jar \
+            &>$WARDEN_HOME/std.log
+}
+
+stop () {
+    if status >/dev/null; then
+        echo "Stopping Warden"
+        start-stop-daemon --signal INT --stop --chuid $WARDEN_USER \
+            --pidfile $WARDEN_HOME/warden.pid
+        rm warden.pid
+    else
+        echo "Warden is not running"
+    fi
+}
+
+restart () {
+    stop
+    start
+}
+
+status () {
+    start-stop-daemon --signal INT --status --chuid $WARDEN_USER \
+        --pidfile $WARDEN_HOME/warden.pid
+}
+
+case $1 in
+    start)
+        start
+    ;;
+    stop | force-stop)
+        stop
+        ;;
+    restart)
+        shift
+        restart "$@"
+        ;;
+    status)
+        status && echo "Warden is running" || echo "Warden is stopped"
+        exit $?
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|status}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0