diff --git a/.travis.yml b/.travis.yml
index cf9fec9168ff1f6f1767f69dc27a96ed2fca1b8e..3ed1cf5ab632bdb0378351894dd50be35fd84b79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ os:
 language: go
 
 go:
-    - 1.5.1
+    - 1.5.2
 
 env:
     - GO15VENDOREXPERIMENT=1
diff --git a/p2p/net/transport/fallback.go b/p2p/net/transport/fallback.go
index ca8afe2dfb40fcd33ed9f0e5c4557be2a1a08c58..534bc3849f0d4c6e0c21c3f39ba95fc7530ed70e 100644
--- a/p2p/net/transport/fallback.go
+++ b/p2p/net/transport/fallback.go
@@ -23,6 +23,7 @@ func (fbd *FallbackDialer) Dial(a ma.Multiaddr) (Conn, error) {
 		return fbd.tcpDial(a)
 	}
 	if mafmt.UTP.Matches(a) {
+		return fbd.tcpDial(a)
 	}
 	return nil, fmt.Errorf("cannot dial %s with fallback dialer", a)
 }
diff --git a/p2p/net/transport/transport_test.go b/p2p/net/transport/transport_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..b81cdaefee40cb0e09af667b2c33762fe756df11
--- /dev/null
+++ b/p2p/net/transport/transport_test.go
@@ -0,0 +1,135 @@
+package transport
+
+import (
+	"fmt"
+	"io"
+	"testing"
+
+	ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
+)
+
+func TestTcpTransport(t *testing.T) {
+	ta := NewTCPTransport()
+	tb := NewTCPTransport()
+
+	zero := "/ip4/127.0.0.1/tcp/0"
+	subtestTransport(t, ta, tb, zero)
+}
+
+func TestUtpTransport(t *testing.T) {
+	ta := NewUtpTransport()
+	tb := NewUtpTransport()
+
+	zero := "/ip4/127.0.0.1/udp/0/utp"
+	subtestTransport(t, ta, tb, zero)
+}
+
+func subtestTransport(t *testing.T, ta, tb Transport, addr string) {
+	maddr, err := ma.NewMultiaddr(addr)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	list, err := ta.Listen(maddr)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dialer, err := tb.Dialer(maddr)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	accepted := make(chan Conn, 1)
+	errs := make(chan error, 1)
+	go func() {
+		b, err := list.Accept()
+		if err != nil {
+			errs <- err
+			return
+		}
+
+		accepted <- b
+	}()
+
+	a, err := dialer.Dial(list.Multiaddr())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var b Conn
+	select {
+	case b = <-accepted:
+	case err := <-errs:
+		t.Fatal(err)
+	}
+
+	defer a.Close()
+	defer b.Close()
+
+	err = checkDataTransfer(a, b)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+}
+
+func checkDataTransfer(a, b io.ReadWriter) error {
+	errs := make(chan error, 2)
+	data := []byte("this is some test data")
+
+	go func() {
+		n, err := a.Write(data)
+		if err != nil {
+			errs <- err
+			return
+		}
+
+		if n != len(data) {
+			errs <- fmt.Errorf("failed to write enough data (a->b)")
+			return
+		}
+
+		buf := make([]byte, len(data))
+		_, err = io.ReadFull(a, buf)
+		if err != nil {
+			errs <- err
+			return
+		}
+
+		errs <- nil
+	}()
+
+	go func() {
+		buf := make([]byte, len(data))
+		_, err := io.ReadFull(b, buf)
+		if err != nil {
+			errs <- err
+			return
+		}
+
+		n, err := b.Write(data)
+		if err != nil {
+			errs <- err
+			return
+		}
+
+		if n != len(data) {
+			errs <- fmt.Errorf("failed to write enough data (b->a)")
+			return
+		}
+
+		errs <- nil
+	}()
+
+	err := <-errs
+	if err != nil {
+		return err
+	}
+	err = <-errs
+	if err != nil {
+		return err
+	}
+
+	return nil
+}