diff --git a/randomsub_test.go b/randomsub_test.go
new file mode 100644
index 0000000..764bdfa
--- /dev/null
+++ b/randomsub_test.go
@@ -0,0 +1,162 @@
+package pubsub
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/libp2p/go-libp2p-core/host"
+)
+
+func getRandomsub(ctx context.Context, h host.Host, opts ...Option) *PubSub {
+	ps, err := NewRandomSub(ctx, h, opts...)
+	if err != nil {
+		panic(err)
+	}
+	return ps
+}
+
+func getRandomsubs(ctx context.Context, hs []host.Host, opts ...Option) []*PubSub {
+	var psubs []*PubSub
+	for _, h := range hs {
+		psubs = append(psubs, getRandomsub(ctx, h, opts...))
+	}
+	return psubs
+}
+
+func TestRandomsubSmall(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	hosts := getNetHosts(t, ctx, 10)
+	psubs := getRandomsubs(ctx, hosts)
+
+	connectAll(t, hosts)
+
+	var subs []*Subscription
+	for _, ps := range psubs {
+		sub, err := ps.Subscribe("test")
+		if err != nil {
+			t.Fatal(err)
+		}
+		subs = append(subs, sub)
+	}
+
+	time.Sleep(time.Second)
+
+	for i := 0; i < 10; i++ {
+		msg := []byte(fmt.Sprintf("message %d", i))
+		psubs[i].Publish("test", msg)
+
+		for _, sub := range subs {
+			assertReceive(t, sub, msg)
+		}
+	}
+}
+
+func TestRandomsubBig(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	hosts := getNetHosts(t, ctx, 50)
+	psubs := getRandomsubs(ctx, hosts)
+
+	connectSome(t, hosts, 12)
+
+	var subs []*Subscription
+	for _, ps := range psubs {
+		sub, err := ps.Subscribe("test")
+		if err != nil {
+			t.Fatal(err)
+		}
+		subs = append(subs, sub)
+	}
+
+	time.Sleep(time.Second)
+
+	for i := 0; i < 10; i++ {
+		msg := []byte(fmt.Sprintf("message %d", i))
+		psubs[i].Publish("test", msg)
+
+		for _, sub := range subs {
+			assertReceive(t, sub, msg)
+		}
+	}
+}
+
+func TestRandomsubMixed(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	hosts := getNetHosts(t, ctx, 40)
+	fsubs := getPubsubs(ctx, hosts[:10])
+	rsubs := getRandomsubs(ctx, hosts[10:])
+	psubs := append(fsubs, rsubs...)
+
+	connectSome(t, hosts, 12)
+
+	var subs []*Subscription
+	for _, ps := range psubs {
+		sub, err := ps.Subscribe("test")
+		if err != nil {
+			t.Fatal(err)
+		}
+		subs = append(subs, sub)
+	}
+
+	time.Sleep(time.Second)
+
+	for i := 0; i < 10; i++ {
+		msg := []byte(fmt.Sprintf("message %d", i))
+		psubs[i].Publish("test", msg)
+
+		for _, sub := range subs {
+			assertReceive(t, sub, msg)
+		}
+	}
+}
+
+func TestRandomsubEnoughPeers(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	hosts := getNetHosts(t, ctx, 40)
+	fsubs := getPubsubs(ctx, hosts[:10])
+	rsubs := getRandomsubs(ctx, hosts[10:])
+	psubs := append(fsubs, rsubs...)
+
+	connectSome(t, hosts, 12)
+
+	var subs []*Subscription
+	for _, ps := range psubs {
+		sub, err := ps.Subscribe("test")
+		if err != nil {
+			t.Fatal(err)
+		}
+		subs = append(subs, sub)
+	}
+
+	time.Sleep(time.Second)
+
+	res := make(chan bool, 1)
+	rsubs[0].eval <- func() {
+		rs := rsubs[0].rt.(*RandomSubRouter)
+		res <- rs.EnoughPeers("test", 0)
+	}
+
+	enough := <-res
+	if !enough {
+		t.Fatal("expected enough peers")
+	}
+
+	rsubs[0].eval <- func() {
+		rs := rsubs[0].rt.(*RandomSubRouter)
+		res <- rs.EnoughPeers("test", 100)
+	}
+
+	enough = <-res
+	if !enough {
+		t.Fatal("expected enough peers")
+	}
+}