diff --git a/config.go b/config.go
index 474d8a8f1..60b69e367 100644
--- a/config.go
+++ b/config.go
@@ -14,6 +14,15 @@ const (
 	// MConnection config keys
 	configKeySendRate = "send_rate"
 	configKeyRecvRate = "recv_rate"
+
+	// Fuzz params
+	configFuzzEnable               = "fuzz_enable" // use the fuzz wrapped conn
+	configFuzzActive               = "fuzz_active" // toggle fuzzing
+	configFuzzMode                 = "fuzz_mode"   // eg. drop, delay
+	configFuzzMaxDelayMilliseconds = "fuzz_max_delay_milliseconds"
+	configFuzzProbDropRW           = "fuzz_prob_drop_rw"
+	configFuzzProbDropConn         = "fuzz_prob_drop_conn"
+	configFuzzProbSleep            = "fuzz_prob_sleep"
 )
 
 func setConfigDefaults(config cfg.Config) {
@@ -26,4 +35,13 @@ func setConfigDefaults(config cfg.Config) {
 	// MConnection default config
 	config.SetDefault(configKeySendRate, 512000) // 500KB/s
 	config.SetDefault(configKeyRecvRate, 512000) // 500KB/s
+
+	// Fuzz defaults
+	config.SetDefault(configFuzzEnable, false)
+	config.SetDefault(configFuzzActive, false)
+	config.SetDefault(configFuzzMode, FuzzModeDrop)
+	config.SetDefault(configFuzzMaxDelayMilliseconds, 3000)
+	config.SetDefault(configFuzzProbDropRW, 0.2)
+	config.SetDefault(configFuzzProbDropConn, 0.00)
+	config.SetDefault(configFuzzProbSleep, 0.00)
 }
diff --git a/fuzz.go b/fuzz.go
new file mode 100644
index 000000000..ee8f43ccf
--- /dev/null
+++ b/fuzz.go
@@ -0,0 +1,141 @@
+package p2p
+
+import (
+	"math/rand"
+	"net"
+	"sync"
+	"time"
+
+	cfg "github.com/tendermint/go-config"
+)
+
+//--------------------------------------------------------
+// delay reads/writes
+// randomly drop reads/writes
+// randomly drop connections
+
+const (
+	FuzzModeDrop  = "drop"
+	FuzzModeDelay = "delay"
+)
+
+func FuzzConn(config cfg.Config, conn net.Conn) net.Conn {
+	return &FuzzedConnection{
+		conn:   conn,
+		start:  time.After(time.Second * 10), // so we have time to do peer handshakes and get set up
+		params: config,
+	}
+}
+
+type FuzzedConnection struct {
+	conn net.Conn
+
+	mtx   sync.Mutex
+	fuzz  bool // we don't start fuzzing right away
+	start <-chan time.Time
+
+	// fuzz params
+	params cfg.Config
+}
+
+func (fc *FuzzedConnection) randomDuration() time.Duration {
+	return time.Millisecond * time.Duration(rand.Int()%fc.MaxDelayMilliseconds())
+}
+
+func (fc *FuzzedConnection) Active() bool {
+	return fc.params.GetBool(configFuzzActive)
+}
+
+func (fc *FuzzedConnection) Mode() string {
+	return fc.params.GetString(configFuzzMode)
+}
+
+func (fc *FuzzedConnection) ProbDropRW() float64 {
+	return fc.params.GetFloat64(configFuzzProbDropRW)
+}
+
+func (fc *FuzzedConnection) ProbDropConn() float64 {
+	return fc.params.GetFloat64(configFuzzProbDropConn)
+}
+
+func (fc *FuzzedConnection) ProbSleep() float64 {
+	return fc.params.GetFloat64(configFuzzProbSleep)
+}
+
+func (fc *FuzzedConnection) MaxDelayMilliseconds() int {
+	return fc.params.GetInt(configFuzzMaxDelayMilliseconds)
+}
+
+// implements the fuzz (delay, kill conn)
+// and returns whether or not the read/write should be ignored
+func (fc *FuzzedConnection) Fuzz() bool {
+	if !fc.shouldFuzz() {
+		return false
+	}
+
+	switch fc.Mode() {
+	case FuzzModeDrop:
+		// randomly drop the r/w, drop the conn, or sleep
+		r := rand.Float64()
+		if r <= fc.ProbDropRW() {
+			return true
+		} else if r < fc.ProbDropRW()+fc.ProbDropConn() {
+			// XXX: can't this fail because machine precision?
+			// XXX: do we need an error?
+			fc.Close()
+			return true
+		} else if r < fc.ProbDropRW()+fc.ProbDropConn()+fc.ProbSleep() {
+			time.Sleep(fc.randomDuration())
+		}
+	case FuzzModeDelay:
+		// sleep a bit
+		time.Sleep(fc.randomDuration())
+	}
+	return false
+}
+
+// we don't fuzz until start chan fires
+func (fc *FuzzedConnection) shouldFuzz() bool {
+	if !fc.Active() {
+		return false
+	}
+
+	fc.mtx.Lock()
+	defer fc.mtx.Unlock()
+	if fc.fuzz {
+		return true
+	}
+
+	select {
+	case <-fc.start:
+		fc.fuzz = true
+	default:
+	}
+	return false
+}
+
+func (fc *FuzzedConnection) Read(data []byte) (n int, err error) {
+	if fc.Fuzz() {
+		return 0, nil
+	}
+	return fc.conn.Read(data)
+}
+
+func (fc *FuzzedConnection) Write(data []byte) (n int, err error) {
+	if fc.Fuzz() {
+		return 0, nil
+	}
+	return fc.conn.Write(data)
+}
+
+// Implements net.Conn
+func (fc *FuzzedConnection) Close() error                  { return fc.conn.Close() }
+func (fc *FuzzedConnection) LocalAddr() net.Addr           { return fc.conn.LocalAddr() }
+func (fc *FuzzedConnection) RemoteAddr() net.Addr          { return fc.conn.RemoteAddr() }
+func (fc *FuzzedConnection) SetDeadline(t time.Time) error { return fc.conn.SetDeadline(t) }
+func (fc *FuzzedConnection) SetReadDeadline(t time.Time) error {
+	return fc.conn.SetReadDeadline(t)
+}
+func (fc *FuzzedConnection) SetWriteDeadline(t time.Time) error {
+	return fc.conn.SetWriteDeadline(t)
+}
diff --git a/switch.go b/switch.go
index 5aa8b64ed..3cb5f5c9d 100644
--- a/switch.go
+++ b/switch.go
@@ -292,6 +292,9 @@ func (sw *Switch) DialPeerWithAddress(addr *NetAddress) (*Peer, error) {
 		log.Info("Failed dialing address", "address", addr, "error", err)
 		return nil, err
 	}
+	if sw.config.GetBool(configFuzzEnable) {
+		conn = FuzzConn(sw.config, conn)
+	}
 	peer, err := sw.AddPeerWithConnection(conn, true)
 	if err != nil {
 		log.Info("Failed adding peer", "address", addr, "conn", conn, "error", err)
@@ -383,6 +386,10 @@ func (sw *Switch) listenerRoutine(l Listener) {
 			continue
 		}
 
+		if sw.config.GetBool(configFuzzEnable) {
+			inConn = FuzzConn(sw.config, inConn)
+		}
+
 		// New inbound connection!
 		_, err := sw.AddPeerWithConnection(inConn, false)
 		if err != nil {