diff --git a/test/dependencies/ma-pipe-unidir/main.go b/test/dependencies/ma-pipe-unidir/main.go
index 03617e618..db77f5fba 100644
--- a/test/dependencies/ma-pipe-unidir/main.go
+++ b/test/dependencies/ma-pipe-unidir/main.go
@@ -43,16 +43,6 @@ func app() int {
 		return 1
 	}
 
-	if len(opts.PidFile) > 0 {
-		data := []byte(strconv.Itoa(os.Getpid()))
-		err := ioutil.WriteFile(opts.PidFile, data, 0644)
-		if err != nil {
-			return 1
-		}
-
-		defer os.Remove(opts.PidFile)
-	}
-
 	maddr, err := ma.NewMultiaddr(addr)
 	if err != nil {
 		return 1
@@ -66,6 +56,16 @@ func app() int {
 			return 1
 		}
 
+		if len(opts.PidFile) > 0 {
+			data := []byte(strconv.Itoa(os.Getpid()))
+			err := ioutil.WriteFile(opts.PidFile, data, 0644)
+			if err != nil {
+				return 1
+			}
+
+			defer os.Remove(opts.PidFile)
+		}
+
 		conn, err = listener.Accept()
 		if err != nil {
 			return 1
@@ -76,6 +76,17 @@ func app() int {
 		if err != nil {
 			return 1
 		}
+
+		if len(opts.PidFile) > 0 {
+			data := []byte(strconv.Itoa(os.Getpid()))
+			err := ioutil.WriteFile(opts.PidFile, data, 0644)
+			if err != nil {
+				return 1
+			}
+
+			defer os.Remove(opts.PidFile)
+		}
+
 	}
 
 	defer conn.Close()
diff --git a/test/sharness/t0180-p2p.sh b/test/sharness/t0180-p2p.sh
index eaeed65b6..38cc65330 100755
--- a/test/sharness/t0180-p2p.sh
+++ b/test/sharness/t0180-p2p.sh
@@ -84,7 +84,7 @@ test_expect_success 'S->C Setup(dnsaddr/addr/ipfs/peerID) client side' '
 '
 
 test_expect_success 'S->C Setup(dnsaddr/addr) client side' '
-  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10104 /dnsaddr/bootstrap.libp2p.io/ 2>&1 > dialer-stdouterr.log
+  ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10104 /dnsaddr/bootstrap.libp2p.io 2>&1 > dialer-stdouterr.log
 '