diff --git a/tunnel/tunnel_test.go b/tunnel/tunnel_test.go
index 3bf17ef1..79db046a 100644
--- a/tunnel/tunnel_test.go
+++ b/tunnel/tunnel_test.go
@@ -24,10 +24,22 @@ func testAccept(t *testing.T, tun Tunnel, wg *sync.WaitGroup) {
 
 	// get a message
 	for {
+		// accept the message
 		m := new(transport.Message)
 		if err := c.Recv(m); err != nil {
 			t.Fatal(err)
 		}
+
+		if v := m.Header["test"]; v != "send" {
+			t.Fatalf("Accept side expected test:send header. Received: %s", v)
+		}
+
+		// now respond
+		m.Header["test"] = "accept"
+		if err := c.Send(m); err != nil {
+			t.Fatal(err)
+		}
+
 		wg.Done()
 		return
 	}
@@ -44,13 +56,24 @@ func testSend(t *testing.T, tun Tunnel) {
 
 	m := transport.Message{
 		Header: map[string]string{
-			"test": "header",
+			"test": "send",
 		},
 	}
 
+	// send the message
 	if err := c.Send(&m); err != nil {
 		t.Fatal(err)
 	}
+
+	// now wait for the response
+	mr := new(transport.Message)
+	if err := c.Recv(mr); err != nil {
+		t.Fatal(err)
+	}
+
+	if v := mr.Header["test"]; v != "accept" {
+		t.Fatalf("Message not received from accepted side. Received: %s", v)
+	}
 }
 
 func TestTunnel(t *testing.T) {