diff --git a/nameserver/nameserver_test.go b/nameserver/nameserver_test.go
index cf9fd1ff..3d5d462c 100644
--- a/nameserver/nameserver_test.go
+++ b/nameserver/nameserver_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
+	wt "github.com/weaveworks/weave/testing"
 	"github.com/weaveworks/weave/testing/gossip"
 )
 
@@ -71,6 +72,12 @@ func (m mapping) Addrs() []address.Address {
 }
 
 func TestNameservers(t *testing.T) {
+	wt.RunWithTimeout(t, time.Minute, func() {
+		testNameservers(t)
+	})
+}
+
+func testNameservers(t *testing.T) {
 	//common.SetLogLevel("debug")
 
 	lookupTimeout := 10 // ms