diff --git a/tests/broker/test_broker.py b/tests/broker/test_broker.py
deleted file mode 100644
index 545abe6..0000000
--- a/tests/broker/test_broker.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2015 Nicolas JOUANIN
-#
-# See the file license.txt for copying permission.
-import unittest
-import logging
-import time
-from hbmqtt.broker import Broker
-
-logging.basicConfig(level=logging.DEBUG)
-
-class TestBroker(unittest.TestCase):
-    def test_start_broker(self):
-        b = Broker()
-        b.start()
-        time.sleep(100)
-        self.assertEqual(b.machine.state, 'started')
-        b.shutdown()
\ No newline at end of file
diff --git a/tests/codecs/test_connect.py b/tests/mqtt/test_connect.py
similarity index 100%
rename from tests/codecs/test_connect.py
rename to tests/mqtt/test_connect.py
diff --git a/tests/codecs/test_utils.py b/tests/test_codecs.py
similarity index 91%
rename from tests/codecs/test_utils.py
rename to tests/test_codecs.py
index 494f7b9..79393a6 100644
--- a/tests/codecs/test_utils.py
+++ b/tests/test_codecs.py
@@ -12,7 +12,7 @@ from hbmqtt.codecs import (
 )
 
 
-class TestUtils(unittest.TestCase):
+class TestCodecs(unittest.TestCase):
     def setUp(self):
         self.loop = asyncio.new_event_loop()