diff --git a/agent/test/Makefile b/agent/test/Makefile
index 5f545e4..cb70c69 100644
--- a/agent/test/Makefile
+++ b/agent/test/Makefile
@@ -30,7 +30,7 @@
 ##
 ##
 
-CXX = g++-4.9
+CXX != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "g++-6"; else echo "g++-4.9"; fi
 CXXFLAGS += -g -O2
 CXXFLAGS += `pkg-config --cflags-only-I grpc++` -I/usr/local/include/pcapplusplus/
 CPPFLAGS += `pkg-config --cflags protobuf grpc`
diff --git a/agent/test/src/bal_stub.cc b/agent/test/src/bal_stub.cc
index 2c778ce..62eb931 100644
--- a/agent/test/src/bal_stub.cc
+++ b/agent/test/src/bal_stub.cc
@@ -301,7 +301,7 @@
 
 bcmos_errno bcmos_task_query(const bcmos_task *task, bcmos_task_parm *parm) {
     printf (" -- stub bcmos_task_query called --\n");
-    return BCM_ERR_OK;
+    return BCM_ERR_ALREADY;
 }
 
 bcmos_errno bcmos_task_create(bcmos_task *task, const bcmos_task_parm *parm) {