diff --git a/.travis.yml b/.travis.yml
index 45823931ac..7d99c9bd3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ branches:
     - master
 
 script:
-  - make test
+  - GOTEST_FLAGS="-p 2 -parallel 2" make test
 
 sudo: false
diff --git a/testutil/retry/retry.go b/testutil/retry/retry.go
index cfbdde3c9d..ba3a7c36b8 100644
--- a/testutil/retry/retry.go
+++ b/testutil/retry/retry.go
@@ -82,7 +82,7 @@ func decorate(s string) string {
 }
 
 func Run(t Failer, f func(r *R)) {
-	run(TwoSeconds(), t, f)
+	run(DefaultFailer(), t, f)
 }
 
 func RunWith(r Retryer, t Failer, f func(r *R)) {
@@ -133,6 +133,11 @@ func run(r Retryer, t Failer, f func(r *R)) {
 	}
 }
 
+// DefaultFailer provides default retry.Run() behavior for unit tests.
+func DefaultFailer() *Timer {
+	return &Timer{Timeout: 7 * time.Second, Wait: 25 * time.Millisecond}
+}
+
 // TwoSeconds repeats an operation for two seconds and waits 25ms in between.
 func TwoSeconds() *Timer {
 	return &Timer{Timeout: 2 * time.Second, Wait: 25 * time.Millisecond}