diff --git a/tests/common.py b/tests/common.py
index 31741ecda67..66460110449 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -56,7 +56,6 @@ def get_test_home_assistant():
         # pylint: disable=protected-access
         loop._thread_ident = threading.get_ident()
         loop.run_forever()
-        loop.close()
         stop_event.set()
 
     orig_start = hass.start
@@ -73,6 +72,7 @@ def get_test_home_assistant():
         """Stop hass."""
         orig_stop()
         stop_event.wait()
+        loop.close()
 
     hass.start = start_hass
     hass.stop = stop_hass
diff --git a/tests/conftest.py b/tests/conftest.py
index c8afa70173e..bc773de8489 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,8 @@
 """Setup some common test helper things."""
+import asyncio
 import functools
 import logging
+import os
 from unittest.mock import patch
 
 import pytest
@@ -13,6 +15,10 @@ from homeassistant.components import mqtt
 from .common import async_test_home_assistant, mock_coro
 from .test_util.aiohttp import mock_aiohttp_client
 
+if os.environ.get('UVLOOP') == '1':
+    import uvloop
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+
 logging.basicConfig()
 logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)