diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go
index 0d22b4f56f..63884f745a 100644
--- a/p2p/simulations/adapters/inproc.go
+++ b/p2p/simulations/adapters/inproc.go
@@ -34,11 +34,6 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
-const (
-	socketReadBuffer  = 5000 * 1024
-	socketWriteBuffer = 5000 * 1024
-)
-
 // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and
 // connects them using net.Pipe or OS socket connections
 type SimAdapter struct {
@@ -378,20 +373,10 @@ func socketPipe() (net.Conn, net.Conn, error) {
 		return nil, nil, err
 	}
 
-	err = setSocketBuffer(pipe1)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = setSocketBuffer(pipe2)
-	if err != nil {
-		return nil, nil, err
-	}
-
 	return pipe1, pipe2, nil
 }
 
-func setSocketBuffer(conn net.Conn) error {
+func setSocketBuffer(conn net.Conn, socketReadBuffer int, socketWriteBuffer int) error {
 	switch v := conn.(type) {
 	case *net.UnixConn:
 		err := v.SetReadBuffer(socketReadBuffer)
diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go
index e20a0d8b8d..b1ef7add0b 100644
--- a/p2p/simulations/adapters/inproc_test.go
+++ b/p2p/simulations/adapters/inproc_test.go
@@ -27,7 +27,7 @@ import (
 func TestSocketPipe(t *testing.T) {
 	c1, c2, err := socketPipe()
 	if err != nil {
-		t.Skip(err)
+		t.Fatal(err)
 	}
 
 	done := make(chan struct{})
@@ -35,15 +35,19 @@ func TestSocketPipe(t *testing.T) {
 	go func() {
 		msgs := 20
 		size := 8
-		for i := 0; i < msgs; i++ {
-			msg := make([]byte, size)
-			_ = binary.PutUvarint(msg, uint64(i))
 
-			_, err := c1.Write(msg)
-			if err != nil {
-				t.Fatal(err)
+		// OS socket pipe is blocking (depending on buffer size on OS), so writes are emitted asynchronously
+		go func() {
+			for i := 0; i < msgs; i++ {
+				msg := make([]byte, size)
+				_ = binary.PutUvarint(msg, uint64(i))
+
+				_, err := c1.Write(msg)
+				if err != nil {
+					t.Fatal(err)
+				}
 			}
-		}
+		}()
 
 		for i := 0; i < msgs; i++ {
 			msg := make([]byte, size)
@@ -72,7 +76,7 @@ func TestSocketPipe(t *testing.T) {
 func TestSocketPipeBidirections(t *testing.T) {
 	c1, c2, err := socketPipe()
 	if err != nil {
-		t.Skip(err)
+		t.Fatal(err)
 	}
 
 	done := make(chan struct{})
@@ -80,14 +84,18 @@ func TestSocketPipeBidirections(t *testing.T) {
 	go func() {
 		msgs := 100
 		size := 4
-		for i := 0; i < msgs; i++ {
-			msg := []byte(`ping`)
 
-			_, err := c1.Write(msg)
-			if err != nil {
-				t.Fatal(err)
+		// OS socket pipe is blocking (depending on buffer size on OS), so writes are emitted asynchronously
+		go func() {
+			for i := 0; i < msgs; i++ {
+				msg := []byte(`ping`)
+
+				_, err := c1.Write(msg)
+				if err != nil {
+					t.Fatal(err)
+				}
 			}
-		}
+		}()
 
 		for i := 0; i < msgs; i++ {
 			out := make([]byte, size)
diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go
index e8de9224e1..bc1b32776f 100644
--- a/swarm/network/simulations/discovery/discovery_test.go
+++ b/swarm/network/simulations/discovery/discovery_test.go
@@ -99,7 +99,7 @@ func testDiscoverySimulationExecAdapter(t *testing.T, nodes, conns int) {
 	testDiscoverySimulation(t, nodes, conns, adapters.NewExecAdapter(baseDir))
 }
 
-func XTestDiscoverySimulationSocketAdapter(t *testing.T) {
+func TestDiscoverySimulationSocketAdapter(t *testing.T) {
 	testDiscoverySimulationSocketAdapter(t, *nodeCount, *initCount)
 }