diff --git a/tools/test/cells/beast b/tools/test/cells/beast
new file mode 100644
index 0000000..c3ed41e
--- /dev/null
+++ b/tools/test/cells/beast
@@ -0,0 +1,20 @@
+# Bare metal cluster
+
+# Use the 10G NIC for cluster communications
+export ONOS_NIC="192.168.200.*"
+
+# ONOS Test proxy
+export OCT=10.254.1.200
+
+# Use the 1G NICs for external access
+export OC1=10.254.1.201
+export OC2=10.254.1.202
+export OC3=10.254.1.203
+export OC4=10.254.1.204
+export OC5=10.254.1.205
+export OC6=10.254.1.206
+export OC7=10.254.1.207
+
+export OCI=${OC1}
+
+export ONOS_FEATURES=webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-null
diff --git a/tools/test/cells/beast-3 b/tools/test/cells/beast-3
new file mode 100644
index 0000000..c2db173
--- /dev/null
+++ b/tools/test/cells/beast-3
@@ -0,0 +1,16 @@
+# Bare metal cluster
+
+# Use the 10G NIC for cluster communications
+export ONOS_NIC="192.168.200.*"
+
+# ONOS Test proxy
+export OCT=10.254.1.200
+
+# Use the 1G NICs for external access
+export OC1=10.254.1.201
+export OC2=10.254.1.202
+export OC3=10.254.1.203
+
+export OCI=${OC1}
+
+export ONOS_FEATURES=webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-null
diff --git a/tools/test/cells/tomx b/tools/test/cells/tomx
index ed8ef83..27f5cd4 100644
--- a/tools/test/cells/tomx
+++ b/tools/test/cells/tomx
@@ -7,5 +7,6 @@
 export OCN="10.128.11.4"
 
 export OCI="${OC1}"
+export OCT="${OC1}"
 
-export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-gui,onos-rest,onos-app-fwd,onos-app-proxyarp"
+export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-null"