diff --git a/Makefile b/Makefile
index 6e56f5c..55311b6 100755
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@
 # Robot config
 ROBOT_SANITY_SINGLE_PON_FILE    ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
 ROBOT_SANITY_DT_SINGLE_PON_FILE    ?= $(ROOT_DIR)/tests/data/bbsim-kind-dt.yaml
-ROBOT_SANITY_MULTIPLE_OLT_FILE    ?= $(ROOT_DIR)/tests/data/multiple-bbsim-kind.yaml
+ROBOT_SANITY_MULTIPLE_OLT_FILE    ?= $(ROOT_DIR)/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
 ROBOT_FAIL_SINGLE_PON_FILE      ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
 ROBOT_SANITY_MULT_PON_FILE      ?= $(ROOT_DIR)/tests/data/bbsim-kind-2x2.yaml
 ROBOT_SCALE_SINGLE_PON_FILE     ?= $(ROOT_DIR)/tests/data/bbsim-kind-16.yaml
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
new file mode 100755
index 0000000..bdf94da
--- /dev/null
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -0,0 +1,65 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+
+# Automated deployment configuration for kind-voltha running BBSim
+
+# Change default values in tests
+has_dataplane: false
+external_libs: false
+teardown_device: true
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim0.voltha.svc
+    serial: BBSIM_OLT_0
+  -
+    ip: bbsim1.voltha.svc
+    serial: BBSIM_OLT_1
+
+hosts:
+  src:
+    -
+      onu: 'BBSM00000001'
+      c_tag: '900'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_0'
+    -
+      onu: 'BBSM00000002'
+      c_tag: '901'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_0'
+    -
+      onu: 'BBSM00010001'
+      c_tag: '900'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_1'
+    -
+      onu: 'BBSM00010001'
+      c_tag: '901'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_1'
+  dst:
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null