diff --git a/Gopkg.lock b/Gopkg.lock
index 32669c198..96df808a5 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -285,6 +285,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "8b1ff7eb1a874905f0d7772407cfacd3fca77a2214530e633c0f4d7e468a6f92"
+  inputs-digest = "8aa4ea7ef6d0ff170127eb5bca89c6c37c767d58047159cfd26a431c5cd5e7ad"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Makefile b/Makefile
index 93312024e..41e5f1291 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,12 @@ gen_certs: clean_certs
 	certstrap init --common-name "tendermint.com" --passphrase ""
 	certstrap request-cert -ip "::" --passphrase ""
 	certstrap sign "::" --CA "tendermint.com" --passphrase ""
-	mv out/{::.crt,::.key} remotedb
+	mv out/::.crt out/::.key remotedb
 
 clean_certs:
 	## Cleaning TLS testing certificates...
 	rm -rf out
-	rm -f remotedb/{::.crt,::.key}
+	rm -f remotedb/::.crt remotedb/::.key
 
 test: gen_certs
 	go test -tags gcc $(shell go list ./... | grep -v vendor)
diff --git a/test.sh b/test.sh
index b3978d3fe..ecf17fc45 100755
--- a/test.sh
+++ b/test.sh
@@ -4,6 +4,9 @@ set -e
 # run the linter
 # make metalinter_test
 
+# setup certs
+make gen_certs
+
 # run the unit tests with coverage
 echo "" > coverage.txt
 for d in $(go list ./... | grep -v vendor); do
@@ -13,3 +16,6 @@ for d in $(go list ./... | grep -v vendor); do
 		rm profile.out
 	fi
 done
+
+# cleanup certs
+make clean_certs