diff --git a/Makefile b/Makefile
index 84f283f..9895c08 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ gitCommit := $(shell git rev-parse --short HEAD)
 # go version output is "go version go1.11.2 linux/amd64"
 goVersion := $(word 3,$(shell go version))
 goLDFlags := -ldflags "-X main.gitCommit=${gitCommit} -X main.productVersion=0.1 -X main.goVersion=${goVersion}"
+PLATFORM := $(shell uname | tr '[:upper:]' '[:lower:]')
 
 pmsImageRepo := speedle-pms
 pmsImageTag := v0.1
@@ -15,23 +16,23 @@ all: build
 build: buildPms buildAds buildSpctl
 
 buildPms:
-	go build ${goLDFlags} -o ${GOPATH}/bin/speedle-pms github.com/oracle/speedle/cmd/speedle-pms
+	go build -o ${GOPATH}/bin/speedle-pms-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/speedle-pms
 
 buildAds:
-	go build ${goLDFlags} -o ${GOPATH}/bin/speedle-ads github.com/oracle/speedle/cmd/speedle-ads
+	go build -o ${GOPATH}/bin/speedle-ads-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/speedle-ads
 
 buildSpctl:
-	go build ${goLDFlags} -o ${GOPATH}/bin/spctl  github.com/oracle/speedle/cmd/spctl
+	go build  -o ${GOPATH}/bin/spctl-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/spctl
 
 image: imagePms imageAds
 
 imagePms:
-	cp ${GOPATH}/bin/speedle-pms deployment/docker/speedle-pms/.
+	cp ${GOPATH}/bin/speedle-pms-${PLATFORM} deployment/docker/speedle-pms/speedle-pms
 	docker build -t ${pmsImageRepo}:${pmsImageTag} --rm --no-cache deployment/docker/speedle-pms
 	rm deployment/docker/speedle-pms/speedle-pms
 
 imageAds:
-	cp ${GOPATH}/bin/speedle-ads deployment/docker/speedle-ads/.
+	cp ${GOPATH}/bin/speedle-ads-${PLATFORM} deployment/docker/speedle-ads/speedle-ads
 	docker build -t ${adsImageRepo}:${adsImageTag} --rm --no-cache deployment/docker/speedle-ads
 	rm deployment/docker/speedle-ads/speedle-ads
 
@@ -75,6 +76,6 @@ testSpeedleTls:
 	pkg/svcs/pmsrest/tls_test-force-client-cert.sh
 clean:
 	rm -rf ${GOPATH}/pkg/linux_amd64/github.com/oracle/speedle
-	rm -f ${GOPATH}/bin/speedle-pms
-	rm -f ${GOPATH}/bin/speedle-ads
-	rm -f ${GOPATH}/bin/spctl
+	rm -f ${GOPATH}/bin/speedle-pms-${PLATFORM}
+	rm -f ${GOPATH}/bin/speedle-ads-${PLATFORM}
+	rm -f ${GOPATH}/bin/spctl-${PLATFORM}
diff --git a/setTestEnv.sh b/setTestEnv.sh
old mode 100644
new mode 100755
index 38dfa43..437e37c
--- a/setTestEnv.sh
+++ b/setTestEnv.sh
@@ -5,6 +5,7 @@ export ADS_ENDPOINT=http://127.0.0.1:6734
 export PMS_ADMIN_TOKEN=
 export ADS_ADMIN_TOKEN=
 export SP_APP_NAME=spctl
+export PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
 
 echo "----------------------------------"
 echo "PMS_ENDPOINT=${PMS_ENDPOINT}"
@@ -97,13 +98,10 @@ function waitService  {
 }
 
 shopt -s expand_aliases
-if [ `uname -s` == "Darwin" ] ; then
-  alias pms=${GOPATH}/bin/speedle-pms-mac
-  alias ads=${GOPATH}/bin/speedle-ads-mac
-else
-  alias pms=${GOPATH}/bin/speedle-pms
-  alias ads=${GOPATH}/bin/speedle-ads
-fi
+
+alias pms=${GOPATH}/bin/speedle-pms-${PLATFORM}
+alias ads=${GOPATH}/bin/speedle-ads-${PLATFORM}
+alias spctl=${GOPATH}/bin/spctl-${PLATFORM}
 
 function ensureTestDir() {
     if [ "$1" == "file" ];then