diff --git a/tests/test_messaging/test_messaging_functions.py b/tests/test_messaging/test_messaging_functions.py
index df4e650e..42100954 100644
--- a/tests/test_messaging/test_messaging_functions.py
+++ b/tests/test_messaging/test_messaging_functions.py
@@ -21,9 +21,7 @@
 # Written by Matt Prahl <mprahl@redhat.com>
 from __future__ import unicode_literals
 import unittest
-import mock
 from datetime import datetime
-import module_build_service.messaging
 
 
 class TestUtilFunctions(unittest.TestCase):
@@ -42,83 +40,3 @@ class TestUtilFunctions(unittest.TestCase):
         'time_submitted': datetime(2016, 9, 1, 2, 28),
         'version': '4.3.43'
     }
-
-    @mock.patch('fedmsg.tail_messages')
-    def test_fedmsg_listen_build_msg(self, mock_tail_messages):
-        endpoint = 'tcp://hub.fedoraproject.org:9940'
-        topic = 'org.fedoraproject.prod.buildsys.build.state.change'
-        msg = {
-            'source_name': 'datanommer',
-            'i': 2,
-            'timestamp': 1473252386.0,
-            'msg_id': '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c',
-            'topic': 'org.fedoraproject.prod.buildsys.build.state.change',
-            'source_version': '1.2.3',
-            'msg': {
-                'build_id': 2345678,
-                'old': None,
-                'name': 'some-package',
-                'task_id': 1234567,
-                'attribute': 'state',
-                'instance': 'arm',
-                'version': '2.1.0',
-                'owner': 'some_owner',
-                'new': 0,
-                'release': '1.fc26'
-            }
-        }
-        mock_tail_messages.side_effect = \
-            lambda: [('fedora-infrastructure', endpoint, topic, msg)]
-        msg_obj = next(module_build_service.messaging._fedmsg_listen(None))
-        self.assertEquals(type(msg_obj), module_build_service.messaging.KojiBuildChange)
-        self.assertEquals(msg_obj.build_id, 2345678)
-        self.assertEquals(msg_obj.task_id, 1234567)
-        self.assertEquals(msg_obj.build_new_state, 0)
-        self.assertEquals(msg_obj.build_name, 'some-package')
-        self.assertEquals(msg_obj.build_version, '2.1.0')
-        self.assertEquals(msg_obj.build_release, '1.fc26')
-        self.assertEquals(msg_obj.msg_id,
-                          '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c')
-
-    @mock.patch('fedmsg.tail_messages')
-    def test_fedmsg_listen_repo_msg(self, mock_tail_messages):
-        endpoint = 'tcp://hub.fedoraproject.org:9940'
-        topic = 'org.fedoraproject.prod.buildsys.repo.done'
-        msg = {
-            'source_name': 'datanommer',
-            'i': 1,
-            'timestamp': 1473252506.0,
-            'msg_id': '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c',
-            'topic': 'org.fedoraproject.prod.buildsys.repo.done',
-            'source_version': '1.2.0',
-            'msg': {
-                'instance': 'arm',
-                'repo_id': 402102,
-                'tag': 'f23-build',
-                'tag_id': 155
-            }
-        }
-        mock_tail_messages.side_effect = \
-            lambda: [('fedora-infrastructure', endpoint, topic, msg)]
-        msg_obj = next(module_build_service.messaging._fedmsg_listen(None))
-        self.assertEquals(type(msg_obj), module_build_service.messaging.KojiRepoChange)
-        self.assertEquals(msg_obj.repo_tag, 'f23-build')
-        self.assertEquals(msg_obj.msg_id,
-                          '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c')
-
-    @mock.patch('fedmsg.tail_messages')
-    def test_fedmsg_listen_module_build_service_msg(self, mock_tail_messages):
-        endpoint = 'tcp://hub.fedoraproject.org:9940'
-        topic = 'org.fedoraproject.prod.module_build_service.module.state.change'
-        msg = {
-            'msg_id': '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c',
-            'topic': 'org.fedoraproject.prod.module_build_service.module.state.change',
-            'msg': self.module_build_service_msg
-        }
-        mock_tail_messages.side_effect = \
-            lambda: [('fedora-infrastructure', endpoint, topic, msg)]
-        msg_obj = next(module_build_service.messaging._fedmsg_listen(None))
-        self.assertEquals(msg_obj.module_build_id, msg['msg']['id'])
-        self.assertEquals(msg_obj.module_build_state, msg['msg']['state'])
-        self.assertEquals(msg_obj.msg_id,
-                          '2016-e05415d9-9b35-4f13-8b25-0daddeabfb8c')