diff --git a/.scripts/test_all.sh b/.scripts/test_all.sh
index bbe6007..e07d7e4 100755
--- a/.scripts/test_all.sh
+++ b/.scripts/test_all.sh
@@ -24,4 +24,4 @@ fi
 go get -u github.com/aws/aws-sdk-go/...
 
 # Test all packages which are allowed on all Go versions
-go test $packages
+go test -v $packages
diff --git a/subtest_test.go b/subtest_test.go
index 6fd44a6..41a7f5b 100644
--- a/subtest_test.go
+++ b/subtest_test.go
@@ -4,13 +4,20 @@ package tusd_test
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 )
 
+var subTestDepth = 0
+
 func SubTest(t *testing.T, name string, runTest func(*testing.T, *MockFullDataStore)) {
-	fmt.Println("\t=== RUN SubTest:", name)
+	subTestDepth++
+	defer func() { subTestDepth-- }()
+	p := strings.Repeat("\t", subTestDepth)
+
+	fmt.Println(p, "=== RUN SubTest:", name)
 
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
@@ -20,9 +27,9 @@ func SubTest(t *testing.T, name string, runTest func(*testing.T, *MockFullDataSt
 	runTest(t, store)
 
 	if t.Failed() {
-		fmt.Println("\t--- FAIL SubTest:", name)
+		fmt.Println(p, "--- FAIL SubTest:", name)
 		t.FailNow()
 	} else {
-		fmt.Println("\t--- PASS SubTest:", name)
+		fmt.Println(p, "--- PASS SubTest:", name)
 	}
 }