diff --git a/Makefile b/Makefile
index 3825e73..42069b1 100755
--- a/Makefile
+++ b/Makefile
@@ -208,7 +208,7 @@
 
 # target to invoke reconcile tests with openonu go adapter at single ONU resp. multiple OLTs
 reconcile-openonu-go-adapter-tests: ROBOT_MISC_ARGS += -i functionalOnuGo
-reconcile-openonu-go-adapter-tests: ROBOT_MISC_ARGS += -e notreadyOnuGo -X $(ROBOT_DEBUG_LOG_OPT)
+reconcile-openonu-go-adapter-tests: ROBOT_MISC_ARGS += -e notreadyOnuGo $(ROBOT_DEBUG_LOG_OPT)
 reconcile-openonu-go-adapter-tests: ROBOT_FILE := Voltha_ONUReconcileTests.robot
 reconcile-openonu-go-adapter-tests: openonu-go-adapter-tests
 
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index ade42ca..52118ee 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -323,14 +323,9 @@
     ...    ELSE IF    "${workflow}"=="TT"    Perform Sanity Tests TT
     ...    ELSE       Perform Sanity Test
     Disable Onu Device
-    ${alternativeonustates}=  Create List     omci-flows-deleted
-    Run Keyword If    "${workflow}"=="DT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE IF    "${workflow}"=="TT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE       Current State Test All Onus    omci-admin-lock    alternativeonustate=${alternativeonustates}
+    Current State Test All Onus    tech-profile-config-delete-success
     Reconcile Onu Adapter    ${NAMESPACE}    ${usekill2restart}    UNKNOWN
-    Run Keyword If    "${workflow}"=="DT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE IF    "${workflow}"=="TT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE       Current State Test All Onus    omci-admin-lock    alternativeonustate=${alternativeonustates}
+    Current State Test All Onus    tech-profile-config-delete-success
     Wait for all ONU Ports in ONOS Disabled    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}
     Enable Onu Device
     Run Keyword If    "${workflow}"=="DT"    Perform Sanity Test DT     ${suppressaddsubscriber}
@@ -365,10 +360,7 @@
     ...    ELSE IF    "${workflow}"=="TT"    Perform Sanity Tests TT    ${suppressaddsubscriber}
     ...    ELSE       Perform Sanity Test    ${suppressaddsubscriber}
     Disable Onu Device
-    ${alternativeonustates}=  Create List     omci-flows-deleted
-    Run Keyword If    "${workflow}"=="DT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE IF    "${workflow}"=="TT"    Current State Test All Onus    omci-admin-lock
-    ...    ELSE       Current State Test All Onus    omci-admin-lock    alternativeonustate=${alternativeonustates}
+    Current State Test All Onus    tech-profile-config-delete-success
     Wait for all ONU Ports in ONOS Disabled    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}
     Enable Onu Device
     Run Keyword If    "${workflow}"=="DT"    Perform Sanity Test DT     ${suppressaddsubscriber}