diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go
index 1ece4b8232..66fc296a96 100644
--- a/p2p/host/basic/basic_host_test.go
+++ b/p2p/host/basic/basic_host_test.go
@@ -532,16 +532,16 @@ func TestProtoDowngrade(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if s2.Protocol() != "/testing" {
+		t.Fatal("shoould have gotten /testing")
+	}
+
 	_, err = s2.Write(nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	assertWait(t, connectedOn, "/testing")
-
-	if s2.Protocol() != "/testing" {
-		t.Fatal("shoould have gotten /testing")
-	}
 	s2.Close()
 
 }
diff --git a/p2p/protocol/identify/obsaddr_test.go b/p2p/protocol/identify/obsaddr_test.go
index beac7268d9..a4d3e08a2b 100644
--- a/p2p/protocol/identify/obsaddr_test.go
+++ b/p2p/protocol/identify/obsaddr_test.go
@@ -218,7 +218,7 @@ func TestObsAddrSet(t *testing.T) {
 	harness.oas.SetTTL(time.Millisecond * 200)
 	time.Sleep(time.Millisecond * 300)
 	if !addrsMatch(harness.oas.Addrs(), []ma.Multiaddr{a1, a2}) {
-		t.Error("addrs should only have a1, a2")
+		t.Errorf("addrs should only have %s, %s; have %s", a1, a2, harness.oas.Addrs())
 	}
 
 	// disconnect from all but b5.