diff --git a/libraries/utils.robot b/libraries/utils.robot
index 11888e8..881e9dc 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -39,7 +39,7 @@
     [Arguments]    ${serial_number}    ${admin_state}    ${oper_status}    ${connect_status}
     [Documentation]    Parses the output of "voltctl device list" and inspects device ${serial_number}
     ...    Arguments are matched for device states of: "admin_state", "oper_status", and "connect_status"
-    ${output}=    Run    voltctl device list -o json
+    ${output}=    Run    ${VOLTCTL_CONFIG} voltctl device list -o json
     ${jsondata}=    To Json    ${output}
     Log    ${jsondata}
     ${length}=    Get Length    ${jsondata}
@@ -57,7 +57,7 @@
 Check CLI Tools Configured
     [Documentation]    Tests that use 'voltctl' and 'kubectl' should execute this keyword in suite setup
     # check voltctl and kubectl configured
-    ${voltctl_rc}=    Run And Return RC    voltctl
-    ${kubectl_rc}=    Run And Return RC    kubectl
+    ${voltctl_rc}=    Run And Return RC    ${VOLTCTL_CONFIG} voltctl
+    ${kubectl_rc}=    Run And Return RC    ${KUBECTL_CONFIG} kubectl
     Run Keyword If    ${voltctl_rc} != 1 or ${kubectl_rc} != 0    FATAL ERROR
     ...    VOLTCTL and KUBECTL not configured. Please configure before executing tests.
\ No newline at end of file
diff --git a/tests/data/sadis-notp-1.json b/tests/data/sadis-notp-1.json
new file mode 100644
index 0000000..a82ef86
--- /dev/null
+++ b/tests/data/sadis-notp-1.json
@@ -0,0 +1,30 @@
+{
+  "apps": {
+    "org.opencord.sadis": {
+      "sadis": {
+        "integration": {
+          "cache": {
+            "enabled": false,
+            "maxsize": 50,
+            "ttl": "PT0m"
+          }
+        },
+        "entries": [
+          {
+            "id": "BBSIMOLT000",
+            "hardwareIdentifier": "00:00:0a:62:ce:e2",
+            "ipAddress": ":OLT_IPADDR:",
+            "nasId": "BBSIMOLT000",
+            "uplinkPort": 65536
+          },
+          {
+            "id": "BBSM00000001-1",
+            "cTag": 900,
+            "sTag": 900,
+            "nasPortId": "PON 2/1/01/1:1.1.1"
+          }
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/sanity/sanity.robot b/tests/sanity/sanity.robot
index 7d1b633..ce107af 100644
--- a/tests/sanity/sanity.robot
+++ b/tests/sanity/sanity.robot
@@ -24,9 +24,10 @@
 Suite Teardown    Teardown
 
 *** Variables ***
-${server_ip}    localhost
-${timeout}      90s
-${num_onus}     1
+${server_ip}        localhost
+${timeout}          90s
+${num_onus}         1
+${SADIS_CONFIG}     ${CURDIR}/../data/sadis-notp-1.json
 
 *** Test Cases ***
 Activate Device BBSIM OLT/ONU
@@ -35,10 +36,10 @@
     ...    re-validate deployment
     [Tags]    activate
     #create/preprovision device
-    ${rc}    ${device_id}=    Run and Return Rc and Output    voltctl device create -t openolt -H ${BBSIM_SERVICE}:${BBSIM_PORT}
+    ${rc}    ${device_id}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG} voltctl device create -t openolt -H ${BBSIM_SERVICE}:${BBSIM_PORT}
     Should Be Equal As Integers    ${rc}    0
     #enable device
-    ${rc}    ${output}=    Run and Return Rc and Output    voltctl device enable ${device_id}
+    ${rc}    ${output}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG} voltctl device enable ${device_id}
     Should Be Equal As Integers    ${rc}    0
     #validate olt states
     Wait Until Keyword Succeeds    60s    5s    Validate Device    ${BBSIM_OLT_SN}    ENABLED    ACTIVE    REACHABLE
@@ -71,10 +72,15 @@
 *** Keywords ***
 Setup
     [Documentation]    Setup environment
+    Log    Setting up
+    Set Global Variable    ${KUBECTL_CONFIG}    export KUBECONFIG=%{KUBECONFIG}
+    Set Global Variable    ${VOLTCTL_CONFIG}    export VOLTCONFIG=%{VOLTCONFIG}
     Check CLI Tools Configured
     ${onos_auth}=    Create List    karaf    karaf
     ${HEADERS}    Create Dictionary    Content-Type=application/json
     Create Session    ONOS    http://${server_ip}:${ONOS_REST_PORT}    auth=${ONOS_AUTH}
+    ## TODO upload sadis ${sadis_config}
+
 
 Teardown
     [Documentation]    Delete all http sessions