diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py
index 91f8ab8316d..014cdb1c6c6 100644
--- a/tests/components/cloud/test_init.py
+++ b/tests/components/cloud/test_init.py
@@ -73,8 +73,7 @@ def test_constructor_loads_info_from_config():
     assert cl.relayer == 'test-relayer'
 
 
-@asyncio.coroutine
-def test_initialize_loads_info(mock_os, hass):
+async def test_initialize_loads_info(mock_os, hass):
     """Test initialize will load info from config file."""
     mock_os.path.isfile.return_value = True
     mopen = mock_open(read_data=json.dumps({
@@ -88,8 +87,10 @@ def test_initialize_loads_info(mock_os, hass):
     cl.iot.connect.return_value = mock_coro()
 
     with patch('homeassistant.components.cloud.open', mopen, create=True), \
+            patch('homeassistant.components.cloud.Cloud._fetch_jwt_keyset',
+                  return_value=mock_coro(True)), \
             patch('homeassistant.components.cloud.Cloud._decode_claims'):
-        yield from cl.async_start(None)
+        await cl.async_start(None)
 
     assert cl.id_token == 'test-id-token'
     assert cl.access_token == 'test-access-token'
diff --git a/tests/components/homekit/conftest.py b/tests/components/homekit/conftest.py
index f7839265939..55e02de7526 100644
--- a/tests/components/homekit/conftest.py
+++ b/tests/components/homekit/conftest.py
@@ -13,4 +13,4 @@ def hk_driver():
         patch('pyhap.accessory_driver.AccessoryEncoder'), \
         patch('pyhap.accessory_driver.HAPServer'), \
             patch('pyhap.accessory_driver.AccessoryDriver.publish'):
-        return AccessoryDriver(pincode=b'123-45-678')
+        return AccessoryDriver(pincode=b'123-45-678', address='127.0.0.1')