diff --git a/pytest.ini b/pytest.ini
index 26a6fdf..16b0152 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,6 +4,7 @@ env =
     D:BUMPER_CERT=tests/test_certs/bumper.crt
     D:BUMPER_KEY=tests/test_certs/bumper.key
 
-timeout = 60
-log_cli=true
+asyncio_mode = auto
+timeout = 10
+#log_cli=true
 #log_level=DEBUG
\ No newline at end of file
diff --git a/requirements-test.txt b/requirements-test.txt
index af06dc5..5376f69 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -4,18 +4,11 @@ pylint==2.12.2
 pytest==6.2.5
 pytest-cov==3.0.0
 types-cachetools==4.2.9
-pytest-asyncio
-pytest-aiohttp
-testfixtures
-pytest-env
-pytest-timeout
+pytest-asyncio==0.17.2
+pytest-aiohttp==1.0.3
+testfixtures==6.18.3
+pytest-env==0.6.2
+pytest-timeout==2.1.0
 
 #pbr = "*"
-#pytest-aiohttp = "*"
-#pytest-cov = "*"
-#testfixtures = "*"
-#codecov = "*"
 #autoflake = "*"
-#pytest-env = "*"
-#pytest = "*"
-#pytest-asyncio = "*"
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
index e69de29..9959d47 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -0,0 +1,5 @@
+
+HOST = "127.0.0.1"
+MQTT_PORT = 8883
+
+
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..21a09f1
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,27 @@
+import pytest
+
+import bumper
+from tests import HOST, MQTT_PORT
+
+
+@pytest.fixture
+async def mqtt_server():
+    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
+    await mqtt_server.broker_coro()
+    bumper.mqtt_server = mqtt_server
+
+    yield
+
+    await mqtt_server.broker.shutdown()
+
+
+@pytest.fixture
+async def conf_server_client(aiohttp_client):
+    confserver = bumper.ConfServer("127.0.0.1:11111", False)
+    confserver.confserver_app()
+
+    client = await aiohttp_client(confserver.app)
+
+    yield client
+
+    await client.close()
\ No newline at end of file
diff --git a/tests/const.py b/tests/const.py
deleted file mode 100644
index 143d88a..0000000
--- a/tests/const.py
+++ /dev/null
@@ -1,2 +0,0 @@
-HOST = "127.0.0.1"
-MQTT_PORT = 8883
diff --git a/tests/test_confserver.py b/tests/test_confserver.py
index b53cdbb..7dfe287 100644
--- a/tests/test_confserver.py
+++ b/tests/test_confserver.py
@@ -1,33 +1,21 @@
 import asyncio
 import datetime
 import json
-import logging
 import os
-import time
 from unittest import mock
-from unittest.mock import MagicMock
 
 import pytest
-import pytest_aiohttp
-import pytest_asyncio
-import tinydb
 from aiohttp import web
 from testfixtures import LogCapture
 
 import bumper
-from tests.const import HOST, MQTT_PORT
+from tests import HOST, MQTT_PORT
 
 
 def create_confserver():
     return bumper.ConfServer("127.0.0.1:11111", False)
 
 
-def create_app(loop):
-    confserver = bumper.ConfServer("127.0.0.1:11111", False)
-    confserver.confserver_app()
-    return confserver.app
-
-
 def async_return(result):
     f = asyncio.Future()
     f.set_result(result)
@@ -98,15 +86,11 @@ def test_get_milli_time():
     )
 
 
-async def test_base(aiohttp_client):
+@pytest.mark.usefixtures("mqtt_server")
+async def test_base(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
 
-    # Start MQTT
-    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
-    bumper.mqtt_server = mqtt_server
-    await mqtt_server.broker_coro()
-
     # Start XMPP
     xmpp_address = (HOST, 5223)
     xmpp_server = bumper.XMPPServer(xmpp_address)
@@ -118,26 +102,19 @@ async def test_base(aiohttp_client):
     bumper.mqtt_helperbot = mqtt_helperbot
     await mqtt_helperbot.start_helper_bot()
 
-    client = await aiohttp_client(create_app)
-    resp = await client.get("/")
+    resp = await conf_server_client.get("/")
     assert resp.status == 200
 
     mqtt_helperbot.Client.disconnect()
 
-    await mqtt_server.broker.shutdown()
-
     bumper.xmpp_server.disconnect()
 
 
-async def test_restartService(aiohttp_client):
+@pytest.mark.usefixtures("mqtt_server")
+async def test_restartService(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
 
-    # Start MQTT
-    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
-    bumper.mqtt_server = mqtt_server
-    await mqtt_server.broker_coro()
-
     # Start XMPP
     xmpp_address = (HOST, 5223)
     xmpp_server = bumper.XMPPServer(xmpp_address)
@@ -149,42 +126,36 @@ async def test_restartService(aiohttp_client):
     bumper.mqtt_helperbot = mqtt_helperbot
     await mqtt_helperbot.start_helper_bot()
 
-    client = await aiohttp_client(create_app)
-
-    resp = await client.get("/restart_Helperbot")
+    resp = await conf_server_client.get("/restart_Helperbot")
     assert resp.status == 200
 
-    resp = await client.get("/restart_MQTTServer")
+    resp = await conf_server_client.get("/restart_MQTTServer")
     assert resp.status == 200
 
-    resp = await client.get("/restart_XMPPServer")
+    resp = await conf_server_client.get("/restart_XMPPServer")
     assert resp.status == 200
 
     mqtt_helperbot.Client.disconnect()
-    await mqtt_server.broker.shutdown()
 
     xmpp_server.disconnect()
 
 
-async def test_RemoveBot(aiohttp_client):
-    client = await aiohttp_client(create_app)
-    resp = await client.get("/bot/remove/test_did")
+async def test_RemoveBot(conf_server_client):
+    resp = await conf_server_client.get("/bot/remove/test_did")
     assert resp.status == 200
 
 
-async def test_RemoveClient(aiohttp_client):
-    client = await aiohttp_client(create_app)
-    resp = await client.get("/client/remove/test_resource")
+async def test_RemoveClient(conf_server_client):
+    resp = await conf_server_client.get("/client/remove/test_resource")
     assert resp.status == 200
 
 
-async def test_login(aiohttp_client):
+async def test_login(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test without user
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -197,7 +168,7 @@ async def test_login(aiohttp_client):
     bumper.db = "tests/tmp.db"  # Set db location for testing
 
     # Test global_e without user
-    resp = await client.get("/v1/private/us/en/dev_1234/global_e/1/0/0/user/login")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/global_e/1/0/0/user/login")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -208,7 +179,7 @@ async def test_login(aiohttp_client):
 
     # Add a user to db and test with existing users
     bumper.user_add("testuser")
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -219,7 +190,7 @@ async def test_login(aiohttp_client):
 
     # Add a bot to db that will be added to user
     bumper.bot_add("sn_123", "did_123", "dev_123", "res_123", "com_123")
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -238,7 +209,7 @@ async def test_login(aiohttp_client):
     }
     bumper.bot_full_upsert(newbot)
 
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/login")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -248,16 +219,15 @@ async def test_login(aiohttp_client):
     assert "username" in jsonresp["data"]
 
 
-async def test_logout(aiohttp_client):
+async def test_logout(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Add a token to user and test
     bumper.user_add("testuser")
     bumper.user_add_device("testuser", "dev_1234")
     bumper.user_add_token("testuser", "token_1234")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/logout?accessToken={}".format(
             "token_1234"
         )
@@ -269,13 +239,12 @@ async def test_logout(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_checkLogin(aiohttp_client):
+async def test_checkLogin(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test without token
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/checkLogin?accessToken={}".format(
             None
         )
@@ -291,7 +260,7 @@ async def test_checkLogin(aiohttp_client):
 
     # Add a user to db and test with existing users
     bumper.user_add("testuser")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/checkLogin?accessToken={}".format(
             None
         )
@@ -307,7 +276,7 @@ async def test_checkLogin(aiohttp_client):
 
     # Test again using global_e app
     bumper.user_add("testuser")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/user/checkLogin?accessToken={}".format(
             None
         )
@@ -328,7 +297,7 @@ async def test_checkLogin(aiohttp_client):
     bumper.user_add("testuser")
     bumper.user_add_device("testuser", "dev_1234")
     bumper.user_add_token("testuser", "token_1234")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/checkLogin?accessToken={}".format(
             "token_1234"
         )
@@ -344,7 +313,7 @@ async def test_checkLogin(aiohttp_client):
 
     # Test again using global_e app
     bumper.user_add("testuser")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/user/checkLogin?accessToken={}".format(
             "token_1234"
         )
@@ -359,13 +328,12 @@ async def test_checkLogin(aiohttp_client):
     assert "username" in jsonresp["data"]
 
 
-async def test_getAuthCode(aiohttp_client):
+async def test_getAuthCode(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test without user or token
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/getAuthCode?uid={}&accessToken={}".format(
             None, None
         )
@@ -376,7 +344,7 @@ async def test_getAuthCode(aiohttp_client):
     assert jsonresp["code"] == bumper.ERR_TOKEN_INVALID
 
     # Test as global_e
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/global/auth/getAuthCode?uid={}&deviceId={}".format(None, "dev_1234")
     )
     assert resp.status == 200
@@ -388,7 +356,7 @@ async def test_getAuthCode(aiohttp_client):
     bumper.user_add("testuser")
     bumper.user_add_device("testuser", "dev_1234")
     bumper.user_add_token("testuser", "token_1234")
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/getAuthCode?uid={}&accessToken={}".format(
             "testuser", "token_1234"
         )
@@ -401,7 +369,7 @@ async def test_getAuthCode(aiohttp_client):
     assert "ecovacsUid" in jsonresp["data"]
 
     # The above should have added an authcode to token, try again to test with existing authcode
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/user/getAuthCode?uid={}&accessToken={}".format(
             "testuser", "token_1234"
         )
@@ -414,19 +382,18 @@ async def test_getAuthCode(aiohttp_client):
     assert "ecovacsUid" in jsonresp["data"]
 
 
-async def test_checkAgreement(aiohttp_client):
+async def test_checkAgreement(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/checkAgreement")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/user/checkAgreement")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
     # Test as global_e
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/user/checkAgreement"
     )
     assert resp.status == 200
@@ -435,12 +402,11 @@ async def test_checkAgreement(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_homePageAlert(aiohttp_client):
+async def test_homePageAlert(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/ios/1/0/0/campaign/homePageAlert"
     )
     assert resp.status == 200
@@ -449,24 +415,22 @@ async def test_homePageAlert(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_checkVersion(aiohttp_client):
+async def test_checkVersion(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get("/v1/private/us/en/dev_1234/ios/1/0/0/common/checkVersion")
+    resp = await conf_server_client.get("/v1/private/us/en/dev_1234/ios/1/0/0/common/checkVersion")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_checkAppVersion(aiohttp_client):
+async def test_checkAppVersion(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/common/checkAPPVersion"
     )
     assert resp.status == 200
@@ -475,12 +439,10 @@ async def test_checkAppVersion(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_uploadDeviceInfo(aiohttp_client):
+async def test_uploadDeviceInfo(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
-
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/common/uploadDeviceInfo"
     )
     assert resp.status == 200
@@ -489,12 +451,11 @@ async def test_uploadDeviceInfo(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_getAdByPositionType(aiohttp_client):
+async def test_getAdByPositionType(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/ad/getAdByPositionType"
     )
     assert resp.status == 200
@@ -503,12 +464,11 @@ async def test_getAdByPositionType(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_getBootScreen(aiohttp_client):
+async def test_getBootScreen(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/ad/getBootScreen"
     )
     assert resp.status == 200
@@ -517,12 +477,11 @@ async def test_getBootScreen(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_hasUnreadMsg(aiohttp_client):
+async def test_hasUnreadMsg(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/message/hasUnreadMsg"
     )
     assert resp.status == 200
@@ -531,12 +490,11 @@ async def test_hasUnreadMsg(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_getMsgList(aiohttp_client):
+async def test_getMsgList(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/message/getMsgList"
     )
     assert resp.status == 200
@@ -545,12 +503,11 @@ async def test_getMsgList(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_getSystemReminder(aiohttp_client):
+async def test_getSystemReminder(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/common/getSystemReminder"
     )
     assert resp.status == 200
@@ -559,12 +516,11 @@ async def test_getSystemReminder(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_getCnWapShopConfig(aiohttp_client):
+async def test_getCnWapShopConfig(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/shop/getCnWapShopConfig"
     )
     assert resp.status == 200
@@ -573,10 +529,9 @@ async def test_getCnWapShopConfig(aiohttp_client):
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
 
-async def test_neng_hasUnreadMessage(aiohttp_client):
+async def test_neng_hasUnreadMessage(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     postbody = {
         "auth": {
@@ -588,42 +543,40 @@ async def test_neng_hasUnreadMessage(aiohttp_client):
         },
         "count": 20,
     }
-    resp = await client.post("/api/neng/message/hasUnreadMsg", json=postbody)
+    resp = await conf_server_client.post("/api/neng/message/hasUnreadMsg", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["code"] == 0
 
 
-async def test_getProductIotMap(aiohttp_client):
+async def test_getProductIotMap(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.post("/api/pim/product/getProductIotMap")
+    resp = await conf_server_client.post("/api/pim/product/getProductIotMap")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["code"] == bumper.RETURN_API_SUCCESS
 
     # Test getPimFile
-    resp = await client.get("/api/pim/file/get/123")
+    resp = await conf_server_client.get("/api/pim/file/get/123")
     assert resp.status == 200
 
 
-async def test_getUsersAPI(aiohttp_client):
+async def test_getUsersAPI(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
-    resp = await client.get("/api/users/user.do")
+    resp = await conf_server_client.get("/api/users/user.do")
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["result"] == "fail"
 
 
-async def test_getUserAccountInfo(aiohttp_client):
+async def test_getUserAccountInfo(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
     bumper.user_add("testuser")
@@ -633,9 +586,7 @@ async def test_getUserAccountInfo(aiohttp_client):
     bumper.user_add_bot("testuser", "did_1234")
     bumper.bot_add("sn_1234", "did_1234", "class_1234", "res_1234", "com_1234")
 
-    client = await aiohttp_client(create_app)
-
-    resp = await client.get(
+    resp = await conf_server_client.get(
         "/v1/private/us/en/dev_1234/global_e/1/0/0/user/getUserAccountInfo"
     )
     assert resp.status == 200
@@ -646,14 +597,13 @@ async def test_getUserAccountInfo(aiohttp_client):
     assert jsonresp["data"]["userName"] == "fusername_testuser"
 
 
-async def test_postUsersAPI(aiohttp_client):
+async def test_postUsersAPI(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test FindBest
     postbody = {"todo": "FindBest", "service": "EcoMsgNew"}
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -661,7 +611,7 @@ async def test_postUsersAPI(aiohttp_client):
 
     # Test EcoUpdate
     postbody = {"todo": "FindBest", "service": "EcoUpdate"}
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -684,7 +634,7 @@ async def test_postUsersAPI(aiohttp_client):
         "token": "auth_1234",
         "userId": "testuser",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -700,7 +650,7 @@ async def test_postUsersAPI(aiohttp_client):
         "todo": "loginByItToken",
         "token": "auth_1234",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -716,7 +666,7 @@ async def test_postUsersAPI(aiohttp_client):
         "todo": "loginByItToken",
         "token": "auth_1234",
     }
-    resp = await client.post("/api/users/user.do", data=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", data=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -734,7 +684,7 @@ async def test_postUsersAPI(aiohttp_client):
         "todo": "GetDeviceList",
         "userid": "testuser",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -753,7 +703,7 @@ async def test_postUsersAPI(aiohttp_client):
         "nick": "botnick",
         "did": "did_1234",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -772,7 +722,7 @@ async def test_postUsersAPI(aiohttp_client):
         "nick": "botnick",
         "did": "did_1234",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -790,17 +740,16 @@ async def test_postUsersAPI(aiohttp_client):
         "todo": "DeleteOneDevice",
         "did": "did_1234",
     }
-    resp = await client.post("/api/users/user.do", json=postbody)
+    resp = await conf_server_client.post("/api/users/user.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["result"] == "ok"
 
 
-async def test_appsvr_api(aiohttp_client):
+async def test_appsvr_api(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test GetGlobalDeviceList
     postbody = {
@@ -820,7 +769,7 @@ async def test_appsvr_api(aiohttp_client):
         "todo": "GetGlobalDeviceList",
         "userid": "testuser",
     }
-    resp = await client.post("/api/appsvr/app.do", json=postbody)
+    resp = await conf_server_client.post("/api/appsvr/app.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
@@ -829,20 +778,19 @@ async def test_appsvr_api(aiohttp_client):
     bumper.bot_add("sn_1234", "did_1234", "ls1ok3", "res_1234", "eco-ng")
 
     # Test again with bot added
-    resp = await client.post("/api/appsvr/app.do", json=postbody)
+    resp = await conf_server_client.post("/api/appsvr/app.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["ret"] == "ok"
 
 
-async def test_lg_logs(aiohttp_client):
+async def test_lg_logs(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
     bumper.bot_add("sn_1234", "did_1234", "ls1ok3", "res_1234", "eco-ng")
     bumper.bot_set_mqtt("did_1234", True)
     confserver = create_confserver()
-    client = await aiohttp_client(create_app)
     bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot(HOST, MQTT_PORT)
 
     # Test return get status
@@ -868,21 +816,20 @@ async def test_lg_logs(aiohttp_client):
         "resource": "res_1234",
         "td": "GetCleanLogs",
     }
-    resp = await client.post("/api/lg/log.do", json=postbody)
+    resp = await conf_server_client.post("/api/lg/log.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     jsonresp = json.loads(text)
     assert jsonresp["ret"] == "ok"
 
 
-async def test_postLookup(aiohttp_client):
+async def test_postLookup(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
-    client = await aiohttp_client(create_app)
 
     # Test FindBest
     postbody = {"todo": "FindBest", "service": "EcoMsgNew"}
-    resp = await client.post("/lookup.do", json=postbody)
+    resp = await conf_server_client.post("/lookup.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -890,23 +837,22 @@ async def test_postLookup(aiohttp_client):
 
     # Test EcoUpdate
     postbody = {"todo": "FindBest", "service": "EcoUpdate"}
-    resp = await client.post("/lookup.do", json=postbody)
+    resp = await conf_server_client.post("/lookup.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
     assert test_resp["result"] == "ok"
 
 
-async def test_devmgr(aiohttp_client):
+async def test_devmgr(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
     confserver = create_confserver()
-    client = await aiohttp_client(create_app)
     bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot(HOST, MQTT_PORT)
 
     # Test PollSCResult
     postbody = {"td": "PollSCResult"}
-    resp = await client.post("/api/iot/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/iot/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -914,7 +860,7 @@ async def test_devmgr(aiohttp_client):
 
     # Test HasUnreadMsg
     postbody = {"td": "HasUnreadMsg"}
-    resp = await client.post("/api/iot/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/iot/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -935,7 +881,7 @@ async def test_devmgr(aiohttp_client):
     bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
-    resp = await client.post("/api/iot/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/iot/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -946,23 +892,22 @@ async def test_devmgr(aiohttp_client):
     bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_timeout_resp)
     )
-    resp = await client.post("/api/iot/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/iot/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
     assert test_resp["ret"] == "fail"
 
 
-async def test_dim_devmanager(aiohttp_client):
+async def test_dim_devmanager(conf_server_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
     confserver = create_confserver()
-    client = await aiohttp_client(create_app)
     bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot(HOST, MQTT_PORT)
 
     # Test PollSCResult
     postbody = {"td": "PollSCResult"}
-    resp = await client.post("/api/dim/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/dim/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -970,7 +915,7 @@ async def test_dim_devmanager(aiohttp_client):
 
     # Test HasUnreadMsg
     postbody = {"td": "HasUnreadMsg"}
-    resp = await client.post("/api/dim/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/dim/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -991,7 +936,7 @@ async def test_dim_devmanager(aiohttp_client):
     bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
-    resp = await client.post("/api/dim/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/dim/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -1002,7 +947,7 @@ async def test_dim_devmanager(aiohttp_client):
     bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_timeout_resp)
     )
-    resp = await client.post("/api/dim/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/dim/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
@@ -1014,7 +959,7 @@ async def test_dim_devmanager(aiohttp_client):
     bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
-    resp = await client.post("/api/dim/devmanager.do", json=postbody)
+    resp = await conf_server_client.post("/api/dim/devmanager.do", json=postbody)
     assert resp.status == 200
     text = await resp.text()
     test_resp = json.loads(text)
diff --git a/tests/test_mqttserver.py b/tests/test_mqttserver.py
index 7135773..5157d3c 100644
--- a/tests/test_mqttserver.py
+++ b/tests/test_mqttserver.py
@@ -1,25 +1,17 @@
 import asyncio
-import json
-import logging
 import os
 import time
-import xml.etree.ElementTree as ET
-from unittest import mock
 
 import hbmqtt
 import pytest
-import pytest_asyncio
-import tinydb
 from testfixtures import LogCapture
 
 import bumper
-from tests.const import HOST, MQTT_PORT
+from tests import HOST, MQTT_PORT
 
 
+@pytest.mark.usefixtures("mqtt_server")
 async def test_helperbot_message():
-    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
-    await mqtt_server.broker_coro()
-
     with LogCapture() as l:
 
         # Test broadcast message
@@ -142,13 +134,9 @@ async def test_helperbot_message():
         l.clear()
         mqtt_helperbot.Client.disconnect()
 
-    await mqtt_server.broker.shutdown()
-
 
+@pytest.mark.usefixtures("mqtt_server")
 async def test_helperbot_expire_message():
-    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
-    await mqtt_server.broker_coro()
-
     timeout = 0.1
     # Test broadcast message
     mqtt_helperbot = bumper.MQTTHelperBot(HOST, MQTT_PORT, timeout)
@@ -184,13 +172,10 @@ async def test_helperbot_expire_message():
     assert mqtt_helperbot.commands.get(request_id, None) == None
 
     await mqtt_helperbot.Client.disconnect()
-    await mqtt_server.broker.shutdown()
 
 
+@pytest.mark.usefixtures("mqtt_server")
 async def test_helperbot_sendcommand():
-    mqtt_server = bumper.MQTTServer(HOST, MQTT_PORT, password_file="tests/passwd")
-    await mqtt_server.broker_coro()
-
     timeout = 0.1
     mqtt_helperbot = bumper.MQTTHelperBot(HOST, MQTT_PORT, timeout)
     bumper.mqtt_helperbot = mqtt_helperbot
@@ -332,8 +317,6 @@ async def test_helperbot_sendcommand():
 
     mqtt_helperbot.Client.disconnect()
 
-    await mqtt_server.broker.shutdown()
-
 
 async def test_mqttserver():
     if os.path.exists("tests/tmp.db"):
@@ -347,107 +330,108 @@ async def test_mqttserver():
 
     await mqtt_server.broker_coro()
 
-    # Test helperbot connect
-    mqtt_helperbot = bumper.MQTTHelperBot(HOST, MQTT_PORT)
-    await mqtt_helperbot.start_helper_bot()
-    assert (
-        mqtt_helperbot.Client._connected_state._value == True
-    )  # Check helperbot is connected
-    await mqtt_helperbot.Client.disconnect()
+    try:
+        # Test helperbot connect
+        mqtt_helperbot = bumper.MQTTHelperBot(HOST, MQTT_PORT)
+        await mqtt_helperbot.start_helper_bot()
+        assert (
+            mqtt_helperbot.Client._connected_state._value == True
+        )  # Check helperbot is connected
+        await mqtt_helperbot.Client.disconnect()
 
-    # Test client connect
-    bumper.user_add("user_123")  # Add user to db
-    bumper.client_add("user_123", "ecouser.net", "resource_123")  # Add client to db
-    test_client = bumper.MQTTHelperBot(HOST, MQTT_PORT)
-    test_client.client_id = "user_123@ecouser.net/resource_123"
-    # await test_client.start_helper_bot()
-    test_client.Client = hbmqtt.client.MQTTClient(
-        client_id=test_client.client_id, config={"check_hostname": False}
-    )
-
-    await test_client.Client.connect(
-        f"mqtts://{HOST}:{MQTT_PORT}/",
-        cafile=bumper.ca_cert,
-    )
-    assert (
-        test_client.Client._connected_state._value == True
-    )  # Check client is connected
-    await test_client.Client.disconnect()
-    assert (
-        test_client.Client._connected_state._value == False
-    )  # Check client is disconnected
-
-    # Test fake_bot connect
-    fake_bot = bumper.MQTTHelperBot(HOST, MQTT_PORT)
-    fake_bot.client_id = "bot_serial@ls1ok3/wC3g"
-    await fake_bot.start_helper_bot()
-    assert (
-        fake_bot.Client._connected_state._value == True
-    )  # Check fake_bot is connected
-    await fake_bot.Client.disconnect()
-
-    # Test file auth client connect
-    test_client = bumper.MQTTHelperBot(HOST, MQTT_PORT)
-    test_client.client_id = "test-file-auth"
-    # await test_client.start_helper_bot()
-    test_client.Client = hbmqtt.client.MQTTClient(
-        client_id=test_client.client_id,
-        config={
-            "check_hostname": False,
-            "auto_reconnect": False,
-            "reconnect_retries": 1,
-        },
-    )
-
-    # good user/pass
-    await test_client.Client.connect(
-        f"mqtts://test-client:abc123!@{HOST}:{MQTT_PORT}/",
-        cafile=bumper.ca_cert,
-        cleansession=True,
-    )
-
-    assert (
-        test_client.Client._connected_state._value == True
-    )  # Check client is connected
-    await test_client.Client.disconnect()
-    assert (
-        test_client.Client._connected_state._value == False
-    )  # Check client is disconnected
-
-    # bad password
-    with LogCapture() as l:
+        # Test client connect
+        bumper.user_add("user_123")  # Add user to db
+        bumper.client_add("user_123", "ecouser.net", "resource_123")  # Add client to db
+        test_client = bumper.MQTTHelperBot(HOST, MQTT_PORT)
+        test_client.client_id = "user_123@ecouser.net/resource_123"
+        # await test_client.start_helper_bot()
+        test_client.Client = hbmqtt.client.MQTTClient(
+            client_id=test_client.client_id, config={"check_hostname": False}
+        )
 
         await test_client.Client.connect(
-            f"mqtts://test-client:notvalid!@{HOST}:{MQTT_PORT}/",
+            f"mqtts://{HOST}:{MQTT_PORT}/",
+            cafile=bumper.ca_cert,
+        )
+        assert (
+            test_client.Client._connected_state._value == True
+        )  # Check client is connected
+        await test_client.Client.disconnect()
+        assert (
+            test_client.Client._connected_state._value == False
+        )  # Check client is disconnected
+
+        # Test fake_bot connect
+        fake_bot = bumper.MQTTHelperBot(HOST, MQTT_PORT)
+        fake_bot.client_id = "bot_serial@ls1ok3/wC3g"
+        await fake_bot.start_helper_bot()
+        assert (
+            fake_bot.Client._connected_state._value == True
+        )  # Check fake_bot is connected
+        await fake_bot.Client.disconnect()
+
+        # Test file auth client connect
+        test_client = bumper.MQTTHelperBot(HOST, MQTT_PORT)
+        test_client.client_id = "test-file-auth"
+        # await test_client.start_helper_bot()
+        test_client.Client = hbmqtt.client.MQTTClient(
+            client_id=test_client.client_id,
+            config={
+                "check_hostname": False,
+                "auto_reconnect": False,
+                "reconnect_retries": 1,
+            },
+        )
+
+        # good user/pass
+        await test_client.Client.connect(
+            f"mqtts://test-client:abc123!@{HOST}:{MQTT_PORT}/",
             cafile=bumper.ca_cert,
             cleansession=True,
         )
 
-        l.check_present(
-            (
-                "mqttserver",
-                "INFO",
-                "File Authentication Failed - Username: test-client - ClientID: test-file-auth",
-            ),
-            order_matters=False,
-        )
-        # no username in file
-        await test_client.Client.connect(
-            f"mqtts://test-client-noexist:notvalid!@{HOST}:{MQTT_PORT}/",
-            cafile=bumper.ca_cert,
-            cleansession=True,
-        )
+        assert (
+            test_client.Client._connected_state._value == True
+        )  # Check client is connected
+        await test_client.Client.disconnect()
+        assert (
+            test_client.Client._connected_state._value == False
+        )  # Check client is disconnected
 
-        l.check_present(
-            (
-                "mqttserver",
-                "INFO",
-                "File Authentication Failed - No Entry for Username: test-client-noexist - ClientID: test-file-auth",
-            ),
-            order_matters=False,
-        )
+        # bad password
+        with LogCapture() as l:
 
-    await mqtt_server.broker.shutdown()
+            await test_client.Client.connect(
+                f"mqtts://test-client:notvalid!@{HOST}:{MQTT_PORT}/",
+                cafile=bumper.ca_cert,
+                cleansession=True,
+            )
+
+            l.check_present(
+                (
+                    "mqttserver",
+                    "INFO",
+                    "File Authentication Failed - Username: test-client - ClientID: test-file-auth",
+                ),
+                order_matters=False,
+            )
+            # no username in file
+            await test_client.Client.connect(
+                f"mqtts://test-client-noexist:notvalid!@{HOST}:{MQTT_PORT}/",
+                cafile=bumper.ca_cert,
+                cleansession=True,
+            )
+
+            l.check_present(
+                (
+                    "mqttserver",
+                    "INFO",
+                    "File Authentication Failed - No Entry for Username: test-client-noexist - ClientID: test-file-auth",
+                ),
+                order_matters=False,
+            )
+    finally:
+        await mqtt_server.broker.shutdown()
 
 
 async def test_nofileauth_mqttserver():