diff --git a/demo_test/functional_test/importer.robot b/demo_test/functional_test/importer.robot
index 749aa98..5116539 100644
--- a/demo_test/functional_test/importer.robot
+++ b/demo_test/functional_test/importer.robot
@@ -36,10 +36,14 @@
 # network fluctuation.
 ${pod_timeout}    300s
 
-# use_mock_redfish: If true, mock redfish OLTs will be used instead of a 
+# use_mock_redfish: If true, mock redfish OLTs will be used instead of a
 #    physical device. Default: False.
 ${use_mock_redfish}    False
 
+# use_kubernetes_importer: If true, then the importer and demo_test will
+#    be installed using Kubernetes. Default: False
+${use_kubernetes_install}    False
+
 # use_Containerized_dm: If true, then dm will be run from inside the
 #     demo-test container. Default: False.
 ${use_containerized_dm}    False
@@ -128,29 +132,38 @@
     Run Keyword If     ${voltha_suite_setup}    Common Test Suite Setup
     # Ensure the redfish import and demotest containers are deployed and running.
     Run Keyword If     ${use_mock_redfish}    Install Mock Redfish Server
+    Run Keyword If     ${use_kubernetes_install}    Install Importer Using Kubernetes
     Get IP AND PORT
 
 Teardown Suite
     [Documentation]    Clean up devices if desired
     ...    kills processes and cleans up interfaces on src+dst servers
+    Run Keyword If    ${use_kubernetes_install}    Clean Up Importer Using Kubernetes
     Run Keyword If    ${use_mock_redfish}    Clean Up Mock Redfish Server
 
 Install Mock Redfish Server
-    [Documentation]    Installs mock OLTS, redfish importer, demo-test
-    Apply Kubernetes Resources    ../../kubernetes/deploy-redfish-importer.yaml    default
+    [Documentation]    Installs Redfish Importer and Demotest
+    Apply Kubernetes Resources    ../../kubernetes/deploy-mock-olts.yaml    default
     Wait Until Keyword Succeeds    ${pod_timeout}    5s
     ...    Validate Pod Status    ${MOCK1_POD_NAME}    default     Running
     Wait Until Keyword Succeeds    ${pod_timeout}    5s
     ...    Validate Pod Status    ${MOCK2_POD_NAME}    default     Running
-    Wait Until Keyword Succeeds    ${pod_timeout}    5s
-    ...    Validate Pod Status    ${IMPORTER_POD_NAME}    default     Running
-    Wait Until Keyword Succeeds    ${pod_timeout}    5s
-    ...    Validate Pod Status    ${DEMOTEST_POD_NAME}    default     Running
     # After the pods have come online, it may still take a few seconds
     # before they start responding to requests.
     Sleep    10 Seconds
 
+Install Importer Using Kubernetes
+    [Documentation]    Installs mock OLTS
+    Apply Kubernetes Resources    ../../kubernetes/deploy-redfish-importer.yaml    default
+    Wait Until Keyword Succeeds    ${pod_timeout}    5s
+    ...    Validate Pod Status    ${IMPORTER_POD_NAME}    default     Running
+    Wait Until Keyword Succeeds    ${pod_timeout}    5s
+    ...    Validate Pod Status    ${DEMOTEST_POD_NAME}    default     Running
+
 Clean Up Mock Redfish Server
+    Delete Kubernetes Resources    ../../kubernetes/deploy-mock-olts.yaml    default
+
+Clean Up Importer Using Kubernetes
     Delete Kubernetes Resources    ../../kubernetes/deploy-redfish-importer.yaml    default
 
 Get IP AND PORT
diff --git a/demo_test/functional_test/robot-mock-olt-single.yaml b/demo_test/functional_test/robot-mock-olt-single.yaml
index d6a33ad..3f18036 100644
--- a/demo_test/functional_test/robot-mock-olt-single.yaml
+++ b/demo_test/functional_test/robot-mock-olt-single.yaml
@@ -18,6 +18,7 @@
 # to work with one mock redfish OLT.
 
 use_mock_redfish:    True
+use_kubernetes_install:    True
 use_containerized_dm:    True
 
 ADDR_LIST:
diff --git a/demo_test/functional_test/robot-mock-olt.yaml b/demo_test/functional_test/robot-mock-olt.yaml
index 0036154..edb0462 100644
--- a/demo_test/functional_test/robot-mock-olt.yaml
+++ b/demo_test/functional_test/robot-mock-olt.yaml
@@ -19,6 +19,7 @@
 # to work with two mock redfish OLTs.
 
 use_mock_redfish:    True
+use_kubernetes_install:    True
 use_containerized_dm:    True
 
 ADDR_LIST:
diff --git a/demo_test/functional_test/robot-physical-olt-single.yaml b/demo_test/functional_test/robot-physical-olt-single.yaml
new file mode 100644
index 0000000..5232db5
--- /dev/null
+++ b/demo_test/functional_test/robot-physical-olt-single.yaml
@@ -0,0 +1,22 @@
+---
+
+# 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.
+
+# This yaml file overrides importer.robot to configure the robot test
+# to work with one mock redfish OLT.
+
+
+use_kubernetes_install:    True
+use_containerized_dm:    True