diff --git a/samples/deployment/test-network/Makefile b/samples/deployment/test-network/Makefile
index 883e8e97a..2eca7b873 100644
--- a/samples/deployment/test-network/Makefile
+++ b/samples/deployment/test-network/Makefile
@@ -13,6 +13,7 @@ ifeq ($(CC_PATH),)
  $(error CC_PATH is not set)
 endif
 
+
 # Define default value for CONTAINER_CLI if not set
 CONTAINER_CLI ?= docker
 
@@ -36,8 +37,13 @@ ecc-container:
 	if [ "${SGX_MODE}" = "HW" ]; then \
 		export HW_EXTENSION="-hw" ; \
 	fi && \
+	if [ "${WITH_GO}" = "YES" ]; then \
+		export ECC_PATH=${CC_PATH}/mrenclave ; \
+	else \
+	    export ECC_PATH=${CC_PATH}/_build/lib ; \
+	fi && \
 	make -C ${CC_PATH} && \
-	make -C ${FPC_PATH}/ecc DOCKER_IMAGE=fpc/fpc-${CC_ID}$${HW_EXTENSION} DOCKER_ENCLAVE_SO_PATH=${CC_PATH}/_build/lib all docker
+	make -C ${FPC_PATH}/ecc DOCKER_IMAGE=fpc/fpc-${CC_ID}$${HW_EXTENSION} DOCKER_ENCLAVE_SO_PATH=$${ECC_PATH} all docker
 
 ercc-ecc-start: infoln
 	if [ ! -z "${DOCKERD_FPC_PATH}" ]; then \