diff --git a/gossip/comm/mock/mock_comm.go b/gossip/comm/mock/mock_comm.go
new file mode 100644
index 00000000000..4b0df9006f7
--- /dev/null
+++ b/gossip/comm/mock/mock_comm.go
@@ -0,0 +1,185 @@
+/*
+Copyright IBM Corp. 2016 All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+                 http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package mock
+
+import (
+	"github.com/hyperledger/fabric/gossip/comm"
+	"github.com/hyperledger/fabric/gossip/common"
+	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/op/go-logging"
+)
+
+// Mock which aims to simulate socket
+type socketMock struct {
+	// socket endpoint
+	endpoint string
+
+	// To simulate simple tcp socket
+	socket chan interface{}
+}
+
+// Mock of primitive tcp packet structure
+type packetMock struct {
+	// Sender channel message sent from
+	src *socketMock
+
+	// Destination channel sent to
+	dst *socketMock
+
+	msg interface{}
+}
+
+type channelMock struct {
+	accept common.MessageAcceptor
+
+	channel chan comm.ReceivedMessage
+}
+
+type commMock struct {
+	id string
+
+	members map[string]*socketMock
+
+	acceptors []*channelMock
+
+	deadChannel chan common.PKIidType
+
+	done chan struct{}
+}
+
+var logger *logging.Logger // package-level logger
+
+func init() {
+	logger = logging.MustGetLogger("mockComm")
+	logging.SetLevel(logging.DEBUG, logger.Module)
+}
+
+// NewCommMock creates mocked communication object
+func NewCommMock(id string, members map[string]*socketMock) comm.Comm {
+	res := &commMock{
+		id: id,
+
+		members: members,
+
+		acceptors: make([]*channelMock, 0),
+
+		done: make(chan struct{}),
+
+		deadChannel: make(chan common.PKIidType),
+	}
+	// Start communication service
+	go res.start()
+
+	return res
+}
+
+// Respond sends a GossipMessage to the origin from which this ReceivedMessage was sent from
+func (packet *packetMock) Respond(msg *proto.GossipMessage) {
+	packet.src.socket <- &packetMock{
+		src: packet.dst,
+		dst: packet.src,
+		msg: msg,
+	}
+}
+
+// GetGossipMessage returns the underlying GossipMessage
+func (packet *packetMock) GetGossipMessage() *proto.GossipMessage {
+	return packet.msg.(*proto.GossipMessage)
+}
+
+func (mock *commMock) start() {
+	logger.Debug("Starting communication mock module...")
+	for {
+		select {
+		case <-mock.done:
+			{
+				// Got final signal, exiting...
+				logger.Debug("Exiting...")
+				return
+			}
+		case msg := <-mock.members[mock.id].socket:
+			{
+				logger.Debug("Got new message", msg)
+				packet := msg.(*packetMock)
+				for _, channel := range mock.acceptors {
+					// if message acceptor agrees to get
+					// new message forward it to the received
+					// messages channel
+					if channel.accept(packet) {
+						channel.channel <- packet
+					}
+				}
+			}
+		}
+	}
+}
+
+// GetPKIid returns this instance's PKI id
+func (mock *commMock) GetPKIid() common.PKIidType {
+	return common.PKIidType(mock.id)
+}
+
+// Send sends a message to remote peers
+func (mock *commMock) Send(msg *proto.GossipMessage, peers ...*comm.RemotePeer) {
+	for _, peer := range peers {
+		logger.Debug("Sending message to peer ", peer.Endpoint, "from ", mock.id)
+		mock.members[peer.Endpoint].socket <- &packetMock{
+			src: mock.members[mock.id],
+			dst: mock.members[peer.Endpoint],
+			msg: msg,
+		}
+	}
+}
+
+// Probe probes a remote node and returns nil if its responsive
+func (mock *commMock) Probe(peer *comm.RemotePeer) error {
+	return nil
+}
+
+// Accept returns a dedicated read-only channel for messages sent by other nodes that match a certain predicate.
+// Each message from the channel can be used to send a reply back to the sender
+func (mock *commMock) Accept(accept common.MessageAcceptor) <-chan comm.ReceivedMessage {
+	ch := make(chan comm.ReceivedMessage)
+	mock.acceptors = append(mock.acceptors, &channelMock{accept, ch})
+	return ch
+}
+
+// PresumedDead returns a read-only channel for node endpoints that are suspected to be offline
+func (mock *commMock) PresumedDead() <-chan common.PKIidType {
+	return mock.deadChannel
+}
+
+// CloseConn closes a connection to a certain endpoint
+func (mock *commMock) CloseConn(peer *comm.RemotePeer) {
+	// NOOP
+}
+
+// Stop stops the module
+func (mock *commMock) Stop() {
+	logger.Debug("Stopping communication module, closing all accepting channels.")
+	for _, accept := range mock.acceptors {
+		close(accept.channel)
+	}
+	logger.Debug("[XXX]: Sending done signal to close the module.")
+	mock.done <- struct{}{}
+}
+
+// BlackListPKIid prohibits the module communicating with the given PKIid
+func (mock *commMock) BlackListPKIid(PKIid common.PKIidType) {
+	// NOOP
+}
+
diff --git a/gossip/comm/mock/mock_comm_test.go b/gossip/comm/mock/mock_comm_test.go
new file mode 100644
index 00000000000..9b02ccb43ab
--- /dev/null
+++ b/gossip/comm/mock/mock_comm_test.go
@@ -0,0 +1,98 @@
+/*
+Copyright IBM Corp. 2016 All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+                 http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package mock
+
+import (
+	"testing"
+
+	"github.com/hyperledger/fabric/gossip/comm"
+	"github.com/hyperledger/fabric/gossip/common"
+	"github.com/hyperledger/fabric/gossip/proto"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMockComm(t *testing.T) {
+	first := &socketMock{"first", make(chan interface{})}
+	second := &socketMock{"second", make(chan interface{})}
+	members := make(map[string]*socketMock)
+
+	members[first.endpoint] = first
+	members[second.endpoint] = second
+
+	comm1 := NewCommMock(first.endpoint, members)
+	defer comm1.Stop()
+
+	msgCh := comm1.Accept(func(message interface{}) bool {
+		return message.(comm.ReceivedMessage).GetGossipMessage().GetStateRequest() != nil ||
+			message.(comm.ReceivedMessage).GetGossipMessage().GetStateResponse() != nil
+	})
+
+	comm2 := NewCommMock(second.endpoint, members)
+	defer comm2.Stop()
+
+	comm2.Send(&proto.GossipMessage{
+		Content: &proto.GossipMessage_StateRequest{&proto.RemoteStateRequest{
+			SeqNums: []uint64{1, 2, 3},
+		}},
+	}, &comm.RemotePeer{"first", common.PKIidType("first")})
+
+	msg := <-msgCh
+
+	assert.NotNil(t, msg.GetGossipMessage().GetStateRequest())
+}
+
+func TestMockComm_PingPong(t *testing.T) {
+	members := make(map[string]*socketMock)
+
+	members["peerA"] = &socketMock{"peerA", make(chan interface{})}
+	members["peerB"] = &socketMock{"peerB", make(chan interface{})}
+
+	peerA := NewCommMock("peerA", members)
+	peerB := NewCommMock("peerB", members)
+
+	all := func(interface{}) bool {
+		return true
+	}
+
+	rcvChA := peerA.Accept(all)
+	rcvChB := peerB.Accept(all)
+
+	peerA.Send(&proto.GossipMessage{
+		Content: &proto.GossipMessage_DataMsg{
+			&proto.DataMessage{
+				&proto.Payload{1, "", []byte("Ping")},
+			}},
+	}, &comm.RemotePeer{"peerB", common.PKIidType("peerB")})
+
+	msg := <-rcvChB
+	dataMsg := msg.GetGossipMessage().GetDataMsg()
+	data := string(dataMsg.Payload.Data)
+	assert.Equal(t, "Ping", data)
+
+	msg.Respond(&proto.GossipMessage{
+		Content: &proto.GossipMessage_DataMsg{
+			&proto.DataMessage{
+				&proto.Payload{1, "", []byte("Pong")},
+			}},
+	})
+
+	msg = <-rcvChA
+	dataMsg = msg.GetGossipMessage().GetDataMsg()
+	data = string(dataMsg.Payload.Data)
+	assert.Equal(t, "Pong", data)
+
+}