diff --git a/plans/policy/health/setup.sh b/plans/policy/health/setup.sh
index 890df9b..c99af3f 100755
--- a/plans/policy/health/setup.sh
+++ b/plans/policy/health/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright 2017, 2019 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,25 +17,10 @@
 # Place the scripts in run order:
 source ${SCRIPTS}/common_functions.sh
 
-docker run --name i-mock -d jamesdbloom/mockserver
-MOCK_IP=`get-instance-ip.sh i-mock`
-echo ${MOCK_IP}
-
-docker inspect i-mock
-
-# Wait for initialization
-for i in {1..10}; do
-    curl -sS ${MOCK_IP}:1080 && break
-    echo sleep $i
-    sleep $i
-done
-
-${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP}
-
-source ${WORKSPACE}/scripts/policy/script1.sh
+source ${WORKSPACE}/scripts/policy/engine.sh
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" 
+ROBOT_VARIABLES="-v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" 
 export PDP_IP=${PDP_IP}
 export POLICY_IP=${POLICY_IP}
 export DOCKER_IP=${DOCKER_IP}
diff --git a/plans/policy/health/teardown.sh b/plans/policy/health/teardown.sh
index f1f0b21..303ccff 100755
--- a/plans/policy/health/teardown.sh
+++ b/plans/policy/health/teardown.sh
@@ -24,7 +24,6 @@
 
 mkdir -p "${WORKSPACE}"/archives
 
-kill_instance i-mock
 kill_instance drools
 kill_instance pdp
 kill_instance brmsgw
diff --git a/plans/policy/health/testplan.txt b/plans/policy/health/testplan.txt
index ab8a5b0..6bad34f 100644
--- a/plans/policy/health/testplan.txt
+++ b/plans/policy/health/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
-policy/suite1
+policy/engine