diff --git a/build b/build
index e4d1a9a78..d2ca5f451 100755
--- a/build
+++ b/build
@@ -20,9 +20,29 @@ set -e
 DATE=$(date --iso-8601=seconds)
 COMMIT=$(git rev-parse --verify HEAD)
 LDFLAGS="-X main.version=${VERSION:-master} -X main.commit=${COMMIT} -X main.date=${DATE}"
-
-export GO111MODULE=on
 export CGO_ENABLED=0
 
-echo "Building plugins"
-go build -o ${DEST_DIR}/multus -tags no_openssl -ldflags "${LDFLAGS}" "$@" ./multus
+# this if... will be removed when gomodules goes default
+if [ $GO111MODULE == "off" ]; then
+	echo "Building plugin without go module"
+	echo "Warning: this will be deprecated in near future so please use go modules!"
+
+	ORG_PATH="github.com/intel"
+	REPO_PATH="${ORG_PATH}/multus-cni"
+
+	if [ ! -h gopath/src/${REPO_PATH} ]; then
+		mkdir -p gopath/src/${ORG_PATH}
+		ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
+	fi
+
+	export GO15VENDOREXPERIMENT=1
+	export GOBIN=${PWD}/bin
+	export GOPATH=${PWD}/gopath
+	go install -tags no_openssl -ldflags "${LDFLAGS}" "$@" ${REPO_PATH}/multus
+else
+	# build with go modules
+	export GO111MODULE=on
+
+	echo "Building plugins"
+	go build -o ${DEST_DIR}/multus -tags no_openssl -ldflags "${LDFLAGS}" "$@" ./multus
+fi
diff --git a/test.sh b/test.sh
index bab5b5968..bb1177b97 100755
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,23 @@
 #!/usr/bin/env bash
 set -e
 
-export GO111MODULE=on
+# this if... will be removed when gomodules goes default
+if [ $GO111MODULE == "off" ]; then
+	echo "Warning: this will be deprecated in near future so please use go modules!"
 
-bash -c "umask 0; go test -v -covermode=count -coverprofile=coverage.out ./..."
+	ORG_PATH="github.com/intel"
+	REPO_PATH="${ORG_PATH}/multus-cni"
 
+	if [ ! -h gopath/src/${REPO_PATH} ]; then
+		mkdir -p gopath/src/${ORG_PATH}
+		ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
+	fi
+
+	export GO15VENDOREXPERIMENT=1
+	export GOBIN=${PWD}/bin
+	export GOPATH=${PWD}/gopath
+	bash -c "umask 0; cd ${GOPATH}/src/${REPO_PATH}; PATH=${GOROOT}/bin:$(pwd)/bin:${PATH} go test -v -covermode=count -coverprofile=coverage.out ./..."
+else
+	# test with go modules
+	bash -c "umask 0; go test -v -covermode=count -coverprofile=coverage.out ./..."
+fi