diff --git a/.gitignore b/.gitignore
index daf913b1b..bd26a7914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+.vagrant
diff --git a/Makefile b/Makefile
index c94eace2c..7f9b18e1d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 .PHONY: all build clean default system-test unit-test
 
-TO_BUILD := ./ ./netdcli/ 
+TO_BUILD := ./netmaster/ ./netdcli/
+ifeq ($(uname -s),Linux)
 HOST_GOBIN := `which go | xargs dirname`
 HOST_GOROOT := `go env GOROOT`
+endif
 
 all: build unit-test system-test
 
@@ -27,10 +29,10 @@ clean-demo:
 unit-test: build
 	CONTIV_HOST_GOBIN=$(HOST_GOBIN) CONTIV_HOST_GOROOT=$(HOST_GOROOT) ./scripts/unittests -vagrant
 
-system-test: build
+system-test: 
 	go test -v -run "sanity" github.com/contiv/netplugin/systemtests/singlehost 
 	go test --timeout 20m -v -run "sanity" github.com/contiv/netplugin/systemtests/twohosts
 
-regress-test: build
+regress-test:
 	go test -v -run "regress" github.com/contiv/netplugin/systemtests/singlehost 
 	go test --timeout 60m -v -run "regress" github.com/contiv/netplugin/systemtests/twohosts
diff --git a/Vagrantfile b/Vagrantfile
index aa0f76add..816da90ac 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,9 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-netplugin_synced_gopath="/opt/golang"
-host_gobin_path="/opt/go/bin"
-host_goroot_path="/opt/go/root"
+netplugin_synced_gopath = "/opt/golang"
+host_gobin_path = ENV['CONTIV_HOST_GOBIN']
+host_goroot_path = ENV['CONTIV_HOST_GOROOT']
 
 provision_common = <<SCRIPT
 ## setup the environment file. Export the env-vars passed as args to 'vagrant up'
@@ -11,22 +11,34 @@ echo Args passed: [[ $@ ]]
 echo 'export GOPATH=#{netplugin_synced_gopath}' > /etc/profile.d/envvar.sh
 echo 'export GOBIN=$GOPATH/bin' >> /etc/profile.d/envvar.sh
 echo 'export GOSRC=$GOPATH/src' >> /etc/profile.d/envvar.sh
-echo 'export GOROOT=#{host_goroot_path}' >> /etc/profile.d/envvar.sh
-echo 'export PATH=$PATH:#{host_gobin_path}:$GOBIN' >> /etc/profile.d/envvar.sh
+if [ -n "#{host_goroot_path}" ]
+then
+  echo 'export GOROOT=/usr/local/go' >> /etc/profile.d/envvar.sh
+else
+  echo 'export GOROOT=#{host_goroot_path}' >> /etc/profile.d/envvar.sh
+fi
+
+echo 'export PATH=/usr/local/bin:$PATH:#{host_gobin_path}:$GOBIN' >> /etc/profile.d/envvar.sh
 if [ $# -gt 0 ]; then
     echo "export $@" >> /etc/profile.d/envvar.sh
 fi
 
 ## set the mounted host filesystems to be read-only.Just a safety check
 ## to prevent inadvertent modifications from vm.
-(mount -o remount,ro,exec /vagrant) || exit 1
-if [ -e #{host_gobin_path} ]; then
+if [ ! -n "#{host_gobin_path}" ] 
+then
+  (mount -o remount,ro,exec /vagrant) || exit 1
+fi
+
+if [ -e "#{host_gobin_path}" ]; then
     (mount -o remount,ro,exec #{host_gobin_path}) || exit 1
 fi
-if [ -e #{host_goroot_path} ]; then
+if [ -e "#{host_goroot_path}" ]; then
     (mount -o remount,ro,exec #{host_goroot_path}) || exit 1
 fi
-if [ -e #{netplugin_synced_gopath} ]; then
+
+if [ ! -n "#{host_gobin_path}" ] && [ -e "#{netplugin_synced_gopath}" ]
+then
     (mount -o remount,ro,exec #{netplugin_synced_gopath}) || exit 1
 fi
 
@@ -34,10 +46,15 @@ fi
 #(apt-get update -qq > /dev/null && apt-get install -y vim curl python-software-properties git > /dev/null) || exit 1
 #
 ### install Go 1.4
-#(cd /usr/local/ && \
-#curl -L https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz -o go1.4.linux-amd64.tar.gz && \
-#tar -xzf go1.4.linux-amd64.tar.gz) || exit 1
-#
+if [ ! -n "#{host_gobin_path}" ]
+then
+  cd /usr/local && curl -sSL https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar vxz
+  for i in /usr/local/go/bin/*
+  do
+    ln -sf $i /usr/local/bin/$(basename $i)
+  done
+fi
+
 ### install etcd
 #(cd /tmp && \
 #curl -L  https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz -o etcd-v2.0.0-linux-amd64.tar.gz && \
@@ -99,10 +116,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
             # mount the host directories
             node.vm.synced_folder ".", "/vagrant"
             node.vm.synced_folder ENV['GOPATH'], netplugin_synced_gopath
-            if ENV['CONTIV_HOST_GOBIN'] != nil
+            if ENV['CONTIV_HOST_GOBIN'] != nil && ENV["CONTIV_HOST_GOBIN"] != ""
                 node.vm.synced_folder ENV['CONTIV_HOST_GOBIN'], host_gobin_path
             end
-            if ENV['CONTIV_HOST_GOROOT'] != nil
+            if ENV['CONTIV_HOST_GOROOT'] != nil && ENV['CONTIV_HOST_GOROOT'] != ""
                 node.vm.synced_folder ENV['CONTIV_HOST_GOROOT'], host_goroot_path
             end
             node.vm.provision "shell" do |s|
@@ -125,6 +142,8 @@ provision_node = <<SCRIPT
  -listen-peer-urls http://#{node_addr}:2380 \
  -initial-cluster #{node_peers} \
  -initial-cluster-state new 0<&- &>/tmp/etcd.log &) || exit 1
+ cd /opt/golang/src/github.com/contiv/netplugin
+ GOPATH=/opt/golang make build
 SCRIPT
             node.vm.provision "shell" do |s|
                 s.inline = provision_node
diff --git a/systemtests/singlehost/sanity_test.go b/systemtests/singlehost/sanity_test.go
index 4b5734508..be3c0b0a3 100644
--- a/systemtests/singlehost/sanity_test.go
+++ b/systemtests/singlehost/sanity_test.go
@@ -68,7 +68,7 @@ func TestSingleHostSingleVlanPingSuccess_sanity(t *testing.T) {
 		node.RunCommand(cmdStr)
 	}()
 	if err != nil {
-		t.Fatalf("Failed to launch the container. Error: %s, Output: \n%s\n",
+		t.Fatalf("Failed to launch the container. Error: %v, Output: \n%s\n",
 			err, output)
 	}
 
@@ -77,7 +77,7 @@ func TestSingleHostSingleVlanPingSuccess_sanity(t *testing.T) {
 	output, err = node.RunCommandWithOutput(cmdStr)
 
 	if err != nil || string(output) == "" {
-		t.Fatalf("Failed to get ip address of the container. Error: %s, Output: \n%s\n",
+		t.Fatalf("Failed to get ip address of the container. Error: %v, Output: \n%s\n",
 			err, output)
 	}