diff --git a/homeassistant/components/device_tracker/upc_connect.py b/homeassistant/components/device_tracker/upc_connect.py
index 5de412f05bc..a8d39baed57 100644
--- a/homeassistant/components/device_tracker/upc_connect.py
+++ b/homeassistant/components/device_tracker/upc_connect.py
@@ -77,7 +77,7 @@ class UPCDeviceScanner(DeviceScanner):
             finally:
                 self.websession.detach()
 
-        hass.buss.async_listen_once(
+        hass.bus.async_listen_once(
             EVENT_HOMEASSISTANT_STOP, async_logout)
 
     @asyncio.coroutine
diff --git a/tests/test_util/aiohttp.py b/tests/test_util/aiohttp.py
index 7f46f11166d..afe2f626de7 100644
--- a/tests/test_util/aiohttp.py
+++ b/tests/test_util/aiohttp.py
@@ -17,8 +17,6 @@ class AiohttpClientMocker:
         self._cookies = {}
         self.mock_calls = []
 
-        self.cookie_jar = mock.MagicMock()
-
     def request(self, method, url, *,
                 auth=None,
                 status=200,