diff --git a/app/dispatcher/testing/dispatcher.go b/app/dispatcher/testing/dispatcher.go
index 63d219416..e81b88c14 100644
--- a/app/dispatcher/testing/dispatcher.go
+++ b/app/dispatcher/testing/dispatcher.go
@@ -6,23 +6,29 @@ import (
 )
 
 type TestPacketDispatcher struct {
-	LastPacket v2net.Packet
+	LastPacket chan v2net.Packet
 	Handler    func(packet v2net.Packet, traffic ray.OutboundRay)
 }
 
-func (this *TestPacketDispatcher) DispatchToOutbound(packet v2net.Packet) ray.InboundRay {
-	traffic := ray.NewRay()
-	this.LastPacket = packet
-	if this.Handler == nil {
-		go func() {
+func NewTestPacketDispatcher(handler func(packet v2net.Packet, traffic ray.OutboundRay)) *TestPacketDispatcher {
+	if handler == nil {
+		handler = func(packet v2net.Packet, traffic ray.OutboundRay) {
 			for payload := range traffic.OutboundInput() {
 				traffic.OutboundOutput() <- payload.Prepend([]byte("Processed: "))
 			}
 			close(traffic.OutboundOutput())
-		}()
-	} else {
-		go this.Handler(packet, traffic)
+		}
 	}
+	return &TestPacketDispatcher{
+		LastPacket: make(chan v2net.Packet, 16),
+		Handler:    handler,
+	}
+}
+
+func (this *TestPacketDispatcher) DispatchToOutbound(packet v2net.Packet) ray.InboundRay {
+	traffic := ray.NewRay()
+	this.LastPacket <- packet
+	go this.Handler(packet, traffic)
 
 	return traffic
 }
diff --git a/proxy/dokodemo/dokodemo_test.go b/proxy/dokodemo/dokodemo_test.go
index d8a7afad3..9b99fa07f 100644
--- a/proxy/dokodemo/dokodemo_test.go
+++ b/proxy/dokodemo/dokodemo_test.go
@@ -16,7 +16,7 @@ import (
 func TestDokodemoTCP(t *testing.T) {
 	v2testing.Current(t)
 
-	testPacketDispatcher := &testdispatcher.TestPacketDispatcher{}
+	testPacketDispatcher := testdispatcher.NewTestPacketDispatcher(nil)
 
 	data2Send := "Data to be sent to remote."
 
@@ -42,21 +42,23 @@ func TestDokodemoTCP(t *testing.T) {
 	tcpClient.Write([]byte(data2Send))
 	tcpClient.CloseWrite()
 
+	lastPacket := <-testPacketDispatcher.LastPacket
+
 	response := make([]byte, 1024)
 	nBytes, err := tcpClient.Read(response)
 	assert.Error(err).IsNil()
 	tcpClient.Close()
 
 	assert.StringLiteral("Processed: " + data2Send).Equals(string(response[:nBytes]))
-	assert.Bool(testPacketDispatcher.LastPacket.Destination().IsTCP()).IsTrue()
-	netassert.Address(testPacketDispatcher.LastPacket.Destination().Address()).Equals(v2net.IPAddress([]byte{1, 2, 3, 4}))
-	netassert.Port(testPacketDispatcher.LastPacket.Destination().Port()).Equals(128)
+	assert.Bool(lastPacket.Destination().IsTCP()).IsTrue()
+	netassert.Address(lastPacket.Destination().Address()).Equals(v2net.IPAddress([]byte{1, 2, 3, 4}))
+	netassert.Port(lastPacket.Destination().Port()).Equals(128)
 }
 
 func TestDokodemoUDP(t *testing.T) {
 	v2testing.Current(t)
 
-	testPacketDispatcher := &testdispatcher.TestPacketDispatcher{}
+	testPacketDispatcher := testdispatcher.NewTestPacketDispatcher(nil)
 
 	data2Send := "Data to be sent to remote."
 
@@ -80,14 +82,12 @@ func TestDokodemoUDP(t *testing.T) {
 	assert.Error(err).IsNil()
 
 	udpClient.Write([]byte(data2Send))
-
-	response := make([]byte, 1024)
-	nBytes, err := udpClient.Read(response)
-	assert.Error(err).IsNil()
 	udpClient.Close()
 
-	assert.StringLiteral("Processed: " + data2Send).Equals(string(response[:nBytes]))
-	assert.Bool(testPacketDispatcher.LastPacket.Destination().IsUDP()).IsTrue()
-	netassert.Address(testPacketDispatcher.LastPacket.Destination().Address()).Equals(v2net.IPAddress([]byte{5, 6, 7, 8}))
-	netassert.Port(testPacketDispatcher.LastPacket.Destination().Port()).Equals(256)
+	lastPacket := <-testPacketDispatcher.LastPacket
+
+	assert.StringLiteral(data2Send).Equals(string(lastPacket.Chunk().Value))
+	assert.Bool(lastPacket.Destination().IsUDP()).IsTrue()
+	netassert.Address(lastPacket.Destination().Address()).Equals(v2net.IPAddress([]byte{5, 6, 7, 8}))
+	netassert.Port(lastPacket.Destination().Port()).Equals(256)
 }