diff --git a/.travis.yml b/.travis.yml
index 13ecda49..baa74565 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ go:
   - 1.4.3
   - 1.5.2
   - tip
-sudo: false
+dist: trusty
+sudo: required
 install: 'make deps'
 script: 'make test'
 matrix:
diff --git a/Makefile b/Makefile
index 87d3b542..802d33fb 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ race:
 build: mgmt
 
 mgmt: main.go
+	@echo "Building: $(PROGRAM), version: $(VERSION)."
 	go generate
 	go build -ldflags "-X main.version=$(VERSION) -X main.program=$(PROGRAM)"
 
diff --git a/misc/make-deps.sh b/misc/make-deps.sh
index 3bbcfa1e..e07716ab 100755
--- a/misc/make-deps.sh
+++ b/misc/make-deps.sh
@@ -14,18 +14,17 @@ if [ $travis -eq 0 ]; then
 	fi
 	sudo yum install -y golang golang-googlecode-tools-stringer
 	sudo yum install -y hg	# some go dependencies are stored in mercurial
+	sudo yum install -y etcd
 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
-	[ -x build ] && ./build
-	echo $PATH
-	mkdir -p ~/bin/
-	cp bin/etcd ~/bin/
-	cd -
-	rm -rf etcd	# clean up to avoid failing on upstream gofmt errors
-)
+# build etcd
+git clone --recursive https://github.com/coreos/etcd/ && cd etcd
+git checkout v2.2.4	# TODO: update to newer versions as needed
+[ -x build ] && ./build
+mkdir -p ~/bin/
+cp bin/etcd ~/bin/
+cd -
+rm -rf etcd	# clean up to avoid failing on upstream gofmt errors
 
 go get ./...	# get all the go dependencies
 go get golang.org/x/tools/cmd/vet # add in `go vet` for travis
diff --git a/test.sh b/test.sh
index 279ef6db..31de3633 100755
--- a/test.sh
+++ b/test.sh
@@ -19,5 +19,5 @@ go vet && echo PASS
 # do these longer tests only when running on ci
 if env | grep -q -e '^TRAVIS=true$' -e '^JENKINS_URL='; then
 	go test -race
-	#./test/test-shell.sh
+	./test/test-shell.sh
 fi
diff --git a/test/shell/etcd.sh b/test/shell/etcd.sh
index faf4db7e..2e79bd04 100644
--- a/test/shell/etcd.sh
+++ b/test/shell/etcd.sh
@@ -1,7 +1,4 @@
 # NOTE: boiler plate to run etcd; source with: . etcd.sh; should NOT be +x
-set -o errexit
-set -o nounset
-set -o pipefail
 cleanup ()
 {
 	killall etcd || killall -9 etcd || true	# kill etcd