diff --git a/registry/watcher_test.go b/registry/watcher_test.go
index a564bcda..717dbde3 100644
--- a/registry/watcher_test.go
+++ b/registry/watcher_test.go
@@ -1,7 +1,9 @@
 package registry
 
 import (
+	"os"
 	"testing"
+	"time"
 )
 
 func TestWatcher(t *testing.T) {
@@ -76,8 +78,16 @@ func TestWatcher(t *testing.T) {
 		}
 	}
 
+	travis := os.Getenv("TRAVIS")
+
+	var opts []Option
+
+	if travis == "true" {
+		opts = append(opts, Timeout(time.Millisecond*100))
+	}
+
 	// new registry
-	r := NewRegistry()
+	r := NewRegistry(opts...)
 
 	w, err := r.Watch()
 	if err != nil {