diff --git a/misc/make-deps.sh b/misc/make-deps.sh
index 958bc472..54636960 100755
--- a/misc/make-deps.sh
+++ b/misc/make-deps.sh
@@ -26,7 +26,11 @@ fi
 
 # build etcd
 git clone --recursive https://github.com/coreos/etcd/ && cd etcd
-git checkout v2.2.4	# TODO: update to newer versions as needed
+goversion=$(go version)
+# if 'go version' contains string 'devel', then use git master of etcd...
+if [ "${goversion#*devel}" == "$goversion" ]; then
+	git checkout v2.2.4	# TODO: update to newer versions as needed
+fi
 [ -x build ] && ./build
 mkdir -p ~/bin/
 cp bin/etcd ~/bin/
diff --git a/test/test-gofmt.sh b/test/test-gofmt.sh
index e40aa769..3ec66e6a 100755
--- a/test/test-gofmt.sh
+++ b/test/test-gofmt.sh
@@ -9,7 +9,7 @@ ROOT=$(dirname "${BASH_SOURCE}")/..
 
 GO_VERSION=($(go version))
 
-if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5') ]]; then
+if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.2|go1.3|go1.4|go1.5|go1.6') ]]; then
 	echo "Unknown go version '${GO_VERSION}', skipping gofmt."
 	exit 0
 fi