diff --git a/Makefile b/Makefile
index 6f31f9226..2b0827161 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ test:
 # test-race runs the test suite.
 test-race:
 	@echo "==> Testing ${NAME} (race)"
-	@go test -timeout=60s -race -tags="${GOTAGS}" ./... ${TESTARGS}
+	@go test -v -timeout=120s -race -tags="${GOTAGS}" ./... ${TESTARGS}
 .PHONY: test-race
 
 # _cleanup removes any previous binaries
diff --git a/dependency/dependency_test.go b/dependency/dependency_test.go
index f5acf1c91..808c5a299 100644
--- a/dependency/dependency_test.go
+++ b/dependency/dependency_test.go
@@ -37,7 +37,7 @@ var (
 )
 
 func TestMain(m *testing.M) {
-	log.SetOutput(io.Discard)
+	log.SetOutput(os.Stdout)
 	nomadFuture := runTestNomad()
 	runTestVault()
 	tb := &test.TestingTB{}
@@ -269,9 +269,9 @@ func (c *ClientSet) createConsulPeerings(tenancy *test.Tenancy) error {
 func runTestConsul(tb testutil.TestingTB) {
 	consul, err := testutil.NewTestServerConfigT(tb,
 		func(c *testutil.TestServerConfig) {
-			c.LogLevel = "warn"
-			c.Stdout = io.Discard
-			c.Stderr = io.Discard
+			c.LogLevel = "trace"
+			c.Stdout = os.Stdout
+			c.Stderr = os.Stdout
 		})
 	if err != nil {
 		Fatalf("failed to start consul server: %v", err)
@@ -293,7 +293,7 @@ func runTestNomad() <-chan error {
 		"-consul-auto-advertise=false",
 		"-consul-client-auto-join=false", "-consul-server-auto-join=false",
 		"-network-speed=100",
-		"-log-level=error", // We're just discarding it anyway
+		"-log-level=trace", // We're just discarding it anyway
 	)
 	cmd.Stdout = io.Discard
 	cmd.Stderr = io.Discard
@@ -436,11 +436,11 @@ func runTestVault() {
 	}
 	args := []string{
 		"server", "-dev", "-dev-root-token-id", vaultToken,
-		"-dev-no-store-token",
+		"-dev-no-store-token", "-log-level", "trace",
 	}
 	cmd := exec.Command("vault", args...)
-	cmd.Stdout = io.Discard
-	cmd.Stderr = io.Discard
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stdout
 
 	if err := cmd.Start(); err != nil {
 		Fatalf("vault failed to start: %v", err)
diff --git a/main_test.go b/main_test.go
index f47275087..afff6ef20 100644
--- a/main_test.go
+++ b/main_test.go
@@ -24,9 +24,9 @@ func TestMain(m *testing.M) {
 	tb := &test.TestingTB{}
 	consul, err := testutil.NewTestServerConfigT(tb,
 		func(c *testutil.TestServerConfig) {
-			c.LogLevel = "warn"
-			c.Stdout = io.Discard
-			c.Stderr = io.Discard
+			c.LogLevel = "debug"
+			c.Stdout = os.Stdout
+			c.Stderr = os.Stdout
 		})
 	if err != nil {
 		log.Fatal(fmt.Errorf("failed to start consul server: %v", err))
diff --git a/watch/watch_test.go b/watch/watch_test.go
index a967dc454..f653acefc 100644
--- a/watch/watch_test.go
+++ b/watch/watch_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 // sub-main so I can use defer
 func main(m *testing.M) int {
-	log.SetOutput(io.Discard)
+	log.SetOutput(os.Stdout)
 	testVault = newTestVault()
 	defer func() { testVault.Stop() }()
 
@@ -70,11 +70,11 @@ func newTestVault() *vaultServer {
 	}
 	args := []string{
 		"server", "-dev", "-dev-root-token-id", vaultToken,
-		"-dev-no-store-token",
+		"-dev-no-store-token", "-log-level", "trace",
 	}
 	cmd := exec.Command("vault", args...)
-	cmd.Stdout = io.Discard
-	cmd.Stderr = io.Discard
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 
 	if err := cmd.Start(); err != nil {
 		panic("vault failed to start: " + err.Error())
@@ -94,6 +94,7 @@ func vaultTokenSetup(clients *dep.ClientSet) string {
 			Type: "approle",
 		})
 	if err != nil && !strings.Contains(err.Error(), "path is already in use") {
+		log.Printf("failed to enable approle: %v", err)
 		panic(err)
 	}