diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index accb4c5..bffc220 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -17,21 +17,31 @@
 package ch.dissem.bitmessage.networking;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.CustomMessage;
+import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.utils.Property;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.util.concurrent.Future;
 
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -108,6 +118,31 @@ public class NetworkHandlerTest {
         }
     }
 
+    @Test
+    public void ensureCustomMessageIsSentAndResponseRetrieved() throws Exception {
+        final CustomMessage request = new CustomMessage("test request", cryptography().randomBytes(8));
+        try (TestServer server = new TestServer(new TestServer.ConnectionTester() {
+            @Override
+            public void test(InputStream in, OutputStream out) throws Exception {
+                NetworkMessage message = Factory.getNetworkMessage(3, in);
+                assertThat(message, notNullValue());
+                assertThat(message.getPayload(), instanceOf(CustomMessage.class));
+                CustomMessage payload = (CustomMessage) message.getPayload();
+                assertThat(payload.getCustomCommand(), is("test request"));
+                assertThat(payload.getData(), is(request.getData()));
+                new NetworkMessage(new CustomMessage("test response", payload.getData())).write(out);
+            }
+        })) {
+            CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), server.getPort(), request);
+            assertThat(response, notNullValue());
+            assertThat(response.getCustomCommand(), is("test response"));
+            assertThat(response.getData(), is(request.getData()));
+            if (server.getException() != null) {
+                throw server.getException();
+            }
+        }
+    }
+
     @Test(timeout = 5_000)
     public void ensureObjectsAreSynchronizedIfBothHaveObjects() throws Exception {
         peerInventory.init(
@@ -168,4 +203,43 @@ public class NetworkHandlerTest {
         }
         assertEquals(expected, inventory.getInventory().size());
     }
+
+    private static class TestServer implements AutoCloseable {
+        private final ServerSocket socket;
+        private Exception exception;
+
+        private TestServer(final ConnectionTester tester) throws Exception {
+            socket = new ServerSocket(0);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    while (!socket.isClosed()) {
+                        try {
+                            Socket connection = socket.accept();
+                            tester.test(connection.getInputStream(), connection.getOutputStream());
+                        } catch (Exception e) {
+                            exception = e;
+                        }
+                    }
+                }
+            }).start();
+        }
+
+        int getPort() {
+            return socket.getLocalPort();
+        }
+
+        public Exception getException() {
+            return exception;
+        }
+
+        @Override
+        public void close() throws Exception {
+            socket.close();
+        }
+
+        private interface ConnectionTester {
+            void test(InputStream in, OutputStream out) throws Exception;
+        }
+    }
 }