diff --git a/tests/components/alarm_control_panel/test_manual.py b/tests/components/alarm_control_panel/test_manual.py
index 182935080cc..dc5cf8dbd7d 100644
--- a/tests/components/alarm_control_panel/test_manual.py
+++ b/tests/components/alarm_control_panel/test_manual.py
@@ -8,14 +8,13 @@ from datetime import timedelta
 import unittest
 from unittest.mock import patch
 
-import homeassistant.core as ha
 from homeassistant.const import (
     STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
 from homeassistant.components import alarm_control_panel
 import homeassistant.util.dt as dt_util
 
-from tests.common import fire_time_changed
+from tests.common import fire_time_changed, get_test_home_assistant
 
 CODE = 'HELLO_CODE'
 
@@ -24,7 +23,7 @@ class TestAlarmControlPanelManual(unittest.TestCase):
     """ Test the manual alarm module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/alarm_control_panel/test_mqtt.py b/tests/components/alarm_control_panel/test_mqtt.py
index 58c55350cd2..5af6664b52f 100644
--- a/tests/components/alarm_control_panel/test_mqtt.py
+++ b/tests/components/alarm_control_panel/test_mqtt.py
@@ -7,13 +7,13 @@ Tests manual alarm control panel component.
 import unittest
 from unittest.mock import patch
 
-import homeassistant.core as ha
 from homeassistant.const import (
     STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
 from homeassistant.components import alarm_control_panel
 
-from tests.common import mock_mqtt_component, fire_mqtt_message
+from tests.common import (
+    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant)
 
 CODE = 'HELLO_CODE'
 
@@ -22,7 +22,7 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
     """ Test the manual alarm module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.mock_publish = mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/automation/test_event.py b/tests/components/automation/test_event.py
index 465faf4ec8f..893fd47a639 100644
--- a/tests/components/automation/test_event.py
+++ b/tests/components/automation/test_event.py
@@ -6,15 +6,16 @@ Tests event automation.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
 
+from tests.common import get_test_home_assistant
+
 
 class TestAutomationEvent(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.calls = []
 
         def record_call(service):
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index cf7a0567c25..938ec6b6eac 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -6,16 +6,17 @@ Tests automation component.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
 from homeassistant.const import ATTR_ENTITY_ID
 
+from tests.common import get_test_home_assistant
+
 
 class TestAutomation(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.calls = []
 
         def record_call(service):
diff --git a/tests/components/automation/test_mqtt.py b/tests/components/automation/test_mqtt.py
index 516eda53947..2c0a5612213 100644
--- a/tests/components/automation/test_mqtt.py
+++ b/tests/components/automation/test_mqtt.py
@@ -6,16 +6,16 @@ Tests mqtt automation.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
-from tests.common import mock_mqtt_component, fire_mqtt_message
+from tests.common import (
+    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant)
 
 
 class TestAutomationMQTT(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         mock_mqtt_component(self.hass)
         self.calls = []
 
diff --git a/tests/components/automation/test_numeric_state.py b/tests/components/automation/test_numeric_state.py
index ebfc30f2c14..0960acbdcce 100644
--- a/tests/components/automation/test_numeric_state.py
+++ b/tests/components/automation/test_numeric_state.py
@@ -6,15 +6,16 @@ Tests numeric state automation.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
 
+from tests.common import get_test_home_assistant
+
 
 class TestAutomationNumericState(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.calls = []
 
         def record_call(service):
diff --git a/tests/components/automation/test_state.py b/tests/components/automation/test_state.py
index 5e30f505092..fcd1fb616e9 100644
--- a/tests/components/automation/test_state.py
+++ b/tests/components/automation/test_state.py
@@ -6,16 +6,17 @@ Tests state automation.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
 import homeassistant.components.automation.state as state
 
+from tests.common import get_test_home_assistant
+
 
 class TestAutomationState(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.states.set('test.entity', 'hello')
         self.calls = []
 
diff --git a/tests/components/automation/test_sun.py b/tests/components/automation/test_sun.py
index db4782cfd46..4083500c293 100644
--- a/tests/components/automation/test_sun.py
+++ b/tests/components/automation/test_sun.py
@@ -8,19 +8,18 @@ from datetime import datetime
 import unittest
 from unittest.mock import patch
 
-import homeassistant.core as ha
 from homeassistant.components import sun
 import homeassistant.components.automation as automation
 import homeassistant.util.dt as dt_util
 
-from tests.common import fire_time_changed
+from tests.common import fire_time_changed, get_test_home_assistant
 
 
 class TestAutomationSun(unittest.TestCase):
     """ Test the sun automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.components.append('sun')
 
         self.calls = []
diff --git a/tests/components/automation/test_template.py b/tests/components/automation/test_template.py
index 09ec85cbf36..489187a496b 100644
--- a/tests/components/automation/test_template.py
+++ b/tests/components/automation/test_template.py
@@ -6,15 +6,16 @@ Tests template automation.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.automation as automation
 
+from tests.common import get_test_home_assistant
+
 
 class TestAutomationTemplate(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.states.set('test.entity', 'hello')
         self.calls = []
 
diff --git a/tests/components/automation/test_time.py b/tests/components/automation/test_time.py
index dd3f5a6e9fa..41e200a5731 100644
--- a/tests/components/automation/test_time.py
+++ b/tests/components/automation/test_time.py
@@ -8,20 +8,19 @@ from datetime import timedelta
 import unittest
 from unittest.mock import patch
 
-import homeassistant.core as ha
 import homeassistant.util.dt as dt_util
 import homeassistant.components.automation as automation
 from homeassistant.components.automation import time, event
 from homeassistant.const import CONF_PLATFORM
 
-from tests.common import fire_time_changed
+from tests.common import fire_time_changed, get_test_home_assistant
 
 
 class TestAutomationTime(unittest.TestCase):
     """ Test the event automation. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.calls = []
 
         def record_call(service):
diff --git a/tests/components/binary_sensor/test_command_sensor.py b/tests/components/binary_sensor/test_command_sensor.py
index 20aca38e0e6..c2ec3b2f6f6 100644
--- a/tests/components/binary_sensor/test_command_sensor.py
+++ b/tests/components/binary_sensor/test_command_sensor.py
@@ -6,16 +6,17 @@ Tests command binary sensor.
 """
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.const import (STATE_ON, STATE_OFF)
 from homeassistant.components.binary_sensor import command_sensor
 
+from tests.common import get_test_home_assistant
+
 
 class TestCommandSensorBinarySensor(unittest.TestCase):
     """ Test the Template sensor. """
 
     def setUp(self):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):
         """ Stop down stuff we started. """
diff --git a/tests/components/binary_sensor/test_mqtt.py b/tests/components/binary_sensor/test_mqtt.py
index 83fa532d051..f030800e95b 100644
--- a/tests/components/binary_sensor/test_mqtt.py
+++ b/tests/components/binary_sensor/test_mqtt.py
@@ -6,17 +6,18 @@ Tests MQTT binary sensor.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.binary_sensor as binary_sensor
 from tests.common import mock_mqtt_component, fire_mqtt_message
 from homeassistant.const import (STATE_OFF, STATE_ON)
 
+from tests.common import get_test_home_assistant
+
 
 class TestSensorMQTT(unittest.TestCase):
     """ Test the MQTT sensor. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index ac44be640ad..49fe33366a9 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -123,12 +123,14 @@ class TestComponentsDeviceTracker(unittest.TestCase):
         scanner = get_component('device_tracker.test').SCANNER
         scanner.reset()
         scanner.come_home('DEV1')
+
         self.assertTrue(device_tracker.setup(self.hass, {
             device_tracker.DOMAIN: {CONF_PLATFORM: 'test'}}))
         config = device_tracker.load_config(self.yaml_devices, self.hass,
-                                            timedelta(seconds=0), 0)[0]
-        self.assertEqual('dev1', config.dev_id)
-        self.assertEqual(True, config.track)
+                                            timedelta(seconds=0), 0)
+        assert len(config) == 1
+        assert config[0].dev_id == 'dev1'
+        assert config[0].track
 
     def test_discovery(self):
         scanner = get_component('device_tracker.test').SCANNER
diff --git a/tests/components/garage_door/test_demo.py b/tests/components/garage_door/test_demo.py
index 781b47bb3d7..b500bc01013 100644
--- a/tests/components/garage_door/test_demo.py
+++ b/tests/components/garage_door/test_demo.py
@@ -6,9 +6,10 @@ Tests demo garage door component.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.garage_door as gd
 
+from tests.common import get_test_home_assistant
+
 
 LEFT = 'garage_door.left_garage_door'
 RIGHT = 'garage_door.right_garage_door'
@@ -18,7 +19,7 @@ class TestGarageDoorDemo(unittest.TestCase):
     """ Test the demo garage door. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.assertTrue(gd.setup(self.hass, {
             'garage_door': {
                 'platform': 'demo'
diff --git a/tests/components/light/test_mqtt.py b/tests/components/light/test_mqtt.py
index 834573b7c6e..ff55c22f0e3 100644
--- a/tests/components/light/test_mqtt.py
+++ b/tests/components/light/test_mqtt.py
@@ -46,16 +46,16 @@ light:
 import unittest
 
 from homeassistant.const import STATE_ON, STATE_OFF
-import homeassistant.core as ha
 import homeassistant.components.light as light
-from tests.common import mock_mqtt_component, fire_mqtt_message
+from tests.common import (
+  get_test_home_assistant, mock_mqtt_component, fire_mqtt_message)
 
 
 class TestLightMQTT(unittest.TestCase):
     """ Test the MQTT light. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.mock_publish = mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/lock/test_demo.py b/tests/components/lock/test_demo.py
index 7320b1aa69a..d116a9bcd7c 100644
--- a/tests/components/lock/test_demo.py
+++ b/tests/components/lock/test_demo.py
@@ -6,9 +6,10 @@ Tests demo lock component.
 """
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.components import lock
 
+from tests.common import get_test_home_assistant
+
 
 FRONT = 'lock.front_door'
 KITCHEN = 'lock.kitchen_door'
@@ -18,7 +19,7 @@ class TestLockDemo(unittest.TestCase):
     """ Test the demo lock. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.assertTrue(lock.setup(self.hass, {
             'lock': {
                 'platform': 'demo'
diff --git a/tests/components/media_player/test_demo.py b/tests/components/media_player/test_demo.py
index 6565d49dd4e..3af558cb735 100644
--- a/tests/components/media_player/test_demo.py
+++ b/tests/components/media_player/test_demo.py
@@ -6,9 +6,10 @@ Tests demo media_player component.
 """
 import unittest
 from unittest.mock import patch
-import homeassistant.core as ha
 import homeassistant.components.media_player as mp
 
+from tests.common import get_test_home_assistant
+
 entity_id = 'media_player.walkman'
 
 
@@ -16,7 +17,7 @@ class TestDemoMediaPlayer(unittest.TestCase):
     """ Test the media_player module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/media_player/test_universal.py b/tests/components/media_player/test_universal.py
index e359700f2fa..8412db29214 100644
--- a/tests/components/media_player/test_universal.py
+++ b/tests/components/media_player/test_universal.py
@@ -7,14 +7,13 @@ Tests universal media_player component.
 from copy import copy
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.const import (
     STATE_OFF, STATE_ON, STATE_UNKNOWN, STATE_PLAYING, STATE_PAUSED)
 import homeassistant.components.switch as switch
 import homeassistant.components.media_player as media_player
 import homeassistant.components.media_player.universal as universal
 
-from tests.common import mock_service
+from tests.common import mock_service, get_test_home_assistant
 
 
 class MockMediaPlayer(media_player.MediaPlayerDevice):
@@ -87,7 +86,7 @@ class TestMediaPlayer(unittest.TestCase):
     """ Test the media_player module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
         self.mock_mp_1 = MockMediaPlayer(self.hass, 'mock1')
         self.mock_mp_1.update_ha_state()
diff --git a/tests/components/notify/test_demo.py b/tests/components/notify/test_demo.py
index 41b59e96e4f..7cf14c0064f 100644
--- a/tests/components/notify/test_demo.py
+++ b/tests/components/notify/test_demo.py
@@ -6,16 +6,17 @@ Tests notify demo component.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.notify as notify
 from homeassistant.components.notify import demo
 
+from tests.common import get_test_home_assistant
+
 
 class TestNotifyDemo(unittest.TestCase):
     """ Test the demo notify. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.assertTrue(notify.setup(self.hass, {
             'notify': {
                 'platform': 'demo'
diff --git a/tests/components/rollershutter/test_mqtt.py b/tests/components/rollershutter/test_mqtt.py
index df206b3047d..3a5fe936af9 100644
--- a/tests/components/rollershutter/test_mqtt.py
+++ b/tests/components/rollershutter/test_mqtt.py
@@ -7,16 +7,17 @@ Tests MQTT rollershutter.
 import unittest
 
 from homeassistant.const import STATE_OPEN, STATE_CLOSED, STATE_UNKNOWN
-import homeassistant.core as ha
 import homeassistant.components.rollershutter as rollershutter
 from tests.common import mock_mqtt_component, fire_mqtt_message
 
+from tests.common import get_test_home_assistant
+
 
 class TestRollershutterMQTT(unittest.TestCase):
     """ Test the MQTT rollershutter. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.mock_publish = mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/sensor/test_command_sensor.py b/tests/components/sensor/test_command_sensor.py
index 0f4133ddb6e..17b4aab5fb3 100644
--- a/tests/components/sensor/test_command_sensor.py
+++ b/tests/components/sensor/test_command_sensor.py
@@ -6,15 +6,16 @@ Tests command sensor.
 """
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.components.sensor import command_sensor
 
+from tests.common import get_test_home_assistant
+
 
 class TestCommandSensorSensor(unittest.TestCase):
     """ Test the Command line sensor. """
 
     def setUp(self):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):
         """ Stop down stuff we started. """
diff --git a/tests/components/sensor/test_mfi.py b/tests/components/sensor/test_mfi.py
index 9f8efcc6245..58506bdff1b 100644
--- a/tests/components/sensor/test_mfi.py
+++ b/tests/components/sensor/test_mfi.py
@@ -7,11 +7,12 @@ Tests mFi sensor.
 import unittest
 import unittest.mock as mock
 
-import homeassistant.core as ha
 import homeassistant.components.sensor as sensor
 import homeassistant.components.sensor.mfi as mfi
 from homeassistant.const import TEMP_CELCIUS
 
+from tests.common import get_test_home_assistant
+
 
 class TestMfiSensorSetup(unittest.TestCase):
     PLATFORM = mfi
@@ -28,7 +29,7 @@ class TestMfiSensorSetup(unittest.TestCase):
     }
 
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.latitude = 32.87336
         self.hass.config.longitude = 117.22743
 
@@ -87,7 +88,7 @@ class TestMfiSensorSetup(unittest.TestCase):
 
 class TestMfiSensor(unittest.TestCase):
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.latitude = 32.87336
         self.hass.config.longitude = 117.22743
         self.port = mock.MagicMock()
diff --git a/tests/components/sensor/test_mqtt.py b/tests/components/sensor/test_mqtt.py
index 81aeeae6d3c..2d460b8ac3e 100644
--- a/tests/components/sensor/test_mqtt.py
+++ b/tests/components/sensor/test_mqtt.py
@@ -6,16 +6,17 @@ Tests MQTT sensor.
 """
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.sensor as sensor
 from tests.common import mock_mqtt_component, fire_mqtt_message
 
+from tests.common import get_test_home_assistant
+
 
 class TestSensorMQTT(unittest.TestCase):
     """ Test the MQTT sensor. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/sensor/test_template.py b/tests/components/sensor/test_template.py
index 88c4e766aef..14603850296 100644
--- a/tests/components/sensor/test_template.py
+++ b/tests/components/sensor/test_template.py
@@ -4,15 +4,16 @@ tests.components.sensor.test_template
 
 Tests template sensor.
 """
-import homeassistant.core as ha
 import homeassistant.components.sensor as sensor
 
+from tests.common import get_test_home_assistant
+
 
 class TestTemplateSensor:
     """ Test the Template sensor. """
 
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def teardown_method(self, method):
         """ Stop down stuff we started. """
diff --git a/tests/components/sensor/test_yr.py b/tests/components/sensor/test_yr.py
index c4979720a58..b01e51d78ba 100644
--- a/tests/components/sensor/test_yr.py
+++ b/tests/components/sensor/test_yr.py
@@ -9,17 +9,18 @@ from unittest.mock import patch
 
 import pytest
 
-import homeassistant.core as ha
 import homeassistant.components.sensor as sensor
 import homeassistant.util.dt as dt_util
 
+from tests.common import get_test_home_assistant
+
 
 @pytest.mark.usefixtures('betamax_session')
 class TestSensorYr:
     """ Test the Yr sensor. """
 
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.latitude = 32.87336
         self.hass.config.longitude = 117.22743
 
diff --git a/tests/components/switch/test_command_switch.py b/tests/components/switch/test_command_switch.py
index 43055413e09..3aa7bfeb0c0 100644
--- a/tests/components/switch/test_command_switch.py
+++ b/tests/components/switch/test_command_switch.py
@@ -9,16 +9,17 @@ import os
 import tempfile
 import unittest
 
-from homeassistant import core
 from homeassistant.const import STATE_ON, STATE_OFF
 import homeassistant.components.switch as switch
 
+from tests.common import get_test_home_assistant
+
 
 class TestCommandSwitch(unittest.TestCase):
     """ Test the command switch. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = core.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/switch/test_mfi.py b/tests/components/switch/test_mfi.py
index 0f763dc3392..85b676eef58 100644
--- a/tests/components/switch/test_mfi.py
+++ b/tests/components/switch/test_mfi.py
@@ -7,11 +7,12 @@ Tests mFi switch.
 import unittest
 import unittest.mock as mock
 
-import homeassistant.core as ha
 import homeassistant.components.switch as switch
 import homeassistant.components.switch.mfi as mfi
 from tests.components.sensor import test_mfi as test_mfi_sensor
 
+from tests.common import get_test_home_assistant
+
 
 class TestMfiSwitchSetup(test_mfi_sensor.TestMfiSensorSetup):
     PLATFORM = mfi
@@ -45,7 +46,7 @@ class TestMfiSwitchSetup(test_mfi_sensor.TestMfiSensorSetup):
 
 class TestMfiSwitch(unittest.TestCase):
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.latitude = 32.87336
         self.hass.config.longitude = 117.22743
         self.port = mock.MagicMock()
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index e5058f7826e..d412b5293a0 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -7,16 +7,16 @@ Tests MQTT switch.
 import unittest
 
 from homeassistant.const import STATE_ON, STATE_OFF
-import homeassistant.core as ha
 import homeassistant.components.switch as switch
-from tests.common import mock_mqtt_component, fire_mqtt_message
+from tests.common import (
+    mock_mqtt_component, fire_mqtt_message, get_test_home_assistant)
 
 
 class TestSensorMQTT(unittest.TestCase):
     """ Test the MQTT switch. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.mock_publish = mock_mqtt_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/components/switch/test_template.py b/tests/components/switch/test_template.py
index e4bd20b27cb..73e82e6fdd6 100644
--- a/tests/components/switch/test_template.py
+++ b/tests/components/switch/test_template.py
@@ -4,7 +4,6 @@ tests.components.switch.template
 
 Tests template switch.
 """
-import homeassistant.core as ha
 import homeassistant.components as core
 import homeassistant.components.switch as switch
 
@@ -12,12 +11,14 @@ from homeassistant.const import (
     STATE_ON,
     STATE_OFF)
 
+from tests.common import get_test_home_assistant
+
 
 class TestTemplateSwitch:
     """ Test the Template switch. """
 
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
         self.calls = []
 
diff --git a/tests/components/test_alexa.py b/tests/components/test_alexa.py
index a309bf73668..fa08f8e9129 100644
--- a/tests/components/test_alexa.py
+++ b/tests/components/test_alexa.py
@@ -12,10 +12,9 @@ from unittest.mock import patch
 import requests
 
 from homeassistant import bootstrap, const
-import homeassistant.core as ha
 from homeassistant.components import alexa, http
 
-from tests.common import get_test_instance_port
+from tests.common import get_test_instance_port, get_test_home_assistant
 
 API_PASSWORD = "test1234"
 SERVER_PORT = get_test_instance_port()
@@ -36,7 +35,7 @@ def setUpModule(mock_get_local_ip):   # pylint: disable=invalid-name
     """ Initalize a Home Assistant server for testing this module. """
     global hass
 
-    hass = ha.HomeAssistant()
+    hass = get_test_home_assistant()
 
     bootstrap.setup_component(
         hass, http.DOMAIN,
diff --git a/tests/components/test_api.py b/tests/components/test_api.py
index 21a8b7e19ba..6e72666454f 100644
--- a/tests/components/test_api.py
+++ b/tests/components/test_api.py
@@ -17,7 +17,7 @@ from homeassistant import bootstrap, const
 import homeassistant.core as ha
 import homeassistant.components.http as http
 
-from tests.common import get_test_instance_port
+from tests.common import get_test_instance_port, get_test_home_assistant
 
 API_PASSWORD = "test1234"
 SERVER_PORT = get_test_instance_port()
@@ -38,7 +38,7 @@ def setUpModule(mock_get_local_ip):   # pylint: disable=invalid-name
     """ Initializes a Home Assistant server. """
     global hass
 
-    hass = ha.HomeAssistant()
+    hass = get_test_home_assistant()
 
     hass.bus.listen('test_event', lambda _: _)
     hass.states.set('test.test', 'a_state')
diff --git a/tests/components/test_configurator.py b/tests/components/test_configurator.py
index 4e2f30f6c32..28b4ea126c9 100644
--- a/tests/components/test_configurator.py
+++ b/tests/components/test_configurator.py
@@ -7,16 +7,17 @@ Tests Configurator component.
 # pylint: disable=too-many-public-methods,protected-access
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.components.configurator as configurator
 from homeassistant.const import EVENT_TIME_CHANGED
 
+from tests.common import get_test_home_assistant
+
 
 class TestConfigurator(unittest.TestCase):
     """ Test the chromecast module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/test_demo.py b/tests/components/test_demo.py
index 39418852597..ec53e33e8fa 100644
--- a/tests/components/test_demo.py
+++ b/tests/components/test_demo.py
@@ -5,14 +5,14 @@ tests.test_component_demo
 Tests demo component.
 """
 import json
+import os
 import unittest
 from unittest.mock import patch
 
-import homeassistant.core as ha
-import homeassistant.components.demo as demo
+from homeassistant.components import demo, device_tracker
 from homeassistant.remote import JSONEncoder
 
-from tests.common import mock_http_component
+from tests.common import mock_http_component, get_test_home_assistant
 
 
 @patch('homeassistant.components.sun.setup')
@@ -20,13 +20,18 @@ class TestDemo(unittest.TestCase):
     """ Test the demo module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         mock_http_component(self.hass)
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
         self.hass.stop()
 
+        try:
+            os.remove(self.hass.config.path(device_tracker.YAML_DEVICES))
+        except FileNotFoundError:
+            pass
+
     def test_if_demo_state_shows_by_default(self, mock_sun_setup):
         """ Test if demo state shows if we give no configuration. """
         demo.setup(self.hass, {demo.DOMAIN: {}})
diff --git a/tests/components/test_device_sun_light_trigger.py b/tests/components/test_device_sun_light_trigger.py
index 586d67c2f70..255f371b9a7 100644
--- a/tests/components/test_device_sun_light_trigger.py
+++ b/tests/components/test_device_sun_light_trigger.py
@@ -19,17 +19,15 @@ from tests.common import (
     ensure_sun_set)
 
 
-KNOWN_DEV_PATH = None
+KNOWN_DEV_CSV_PATH = os.path.join(get_test_config_dir(),
+                                  device_tracker.CSV_DEVICES)
+KNOWN_DEV_YAML_PATH = os.path.join(get_test_config_dir(),
+                                   device_tracker.YAML_DEVICES)
 
 
 def setUpModule():   # pylint: disable=invalid-name
     """ Initalizes a Home Assistant server. """
-    global KNOWN_DEV_PATH
-
-    KNOWN_DEV_PATH = os.path.join(get_test_config_dir(),
-                                  device_tracker.CSV_DEVICES)
-
-    with open(KNOWN_DEV_PATH, 'w') as fil:
+    with open(KNOWN_DEV_CSV_PATH, 'w') as fil:
         fil.write('device,name,track,picture\n')
         fil.write('DEV1,device 1,1,http://example.com/dev1.jpg\n')
         fil.write('DEV2,device 2,1,http://example.com/dev2.jpg\n')
@@ -37,8 +35,9 @@ def setUpModule():   # pylint: disable=invalid-name
 
 def tearDownModule():   # pylint: disable=invalid-name
     """ Stops the Home Assistant server. """
-    os.remove(os.path.join(get_test_config_dir(),
-                           device_tracker.YAML_DEVICES))
+    for fil in (KNOWN_DEV_CSV_PATH, KNOWN_DEV_YAML_PATH):
+        if os.path.isfile(fil):
+            os.remove(fil)
 
 
 class TestDeviceSunLightTrigger(unittest.TestCase):
diff --git a/tests/components/test_frontend.py b/tests/components/test_frontend.py
index fcd4daddadb..a81cea899f6 100644
--- a/tests/components/test_frontend.py
+++ b/tests/components/test_frontend.py
@@ -11,12 +11,11 @@ from unittest.mock import patch
 
 import requests
 
-import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.components.http as http
 from homeassistant.const import HTTP_HEADER_HA_AUTH
 
-from tests.common import get_test_instance_port
+from tests.common import get_test_instance_port, get_test_home_assistant
 
 API_PASSWORD = "test1234"
 SERVER_PORT = get_test_instance_port()
@@ -37,7 +36,7 @@ def setUpModule(mock_get_local_ip):   # pylint: disable=invalid-name
     """ Initalizes a Home Assistant server. """
     global hass
 
-    hass = ha.HomeAssistant()
+    hass = get_test_home_assistant()
 
     hass.bus.listen('test_event', lambda _: _)
     hass.states.set('test.test', 'a_state')
diff --git a/tests/components/test_graphite.py b/tests/components/test_graphite.py
index 34ad93a86c4..bdcda193863 100644
--- a/tests/components/test_graphite.py
+++ b/tests/components/test_graphite.py
@@ -15,10 +15,12 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
     STATE_ON, STATE_OFF)
 
+from tests.common import get_test_home_assistant
+
 
 class TestGraphite(unittest.TestCase):
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.latitude = 32.87336
         self.hass.config.longitude = 117.22743
         self.gf = graphite.GraphiteFeeder(self.hass, 'foo', 123, 'ha')
diff --git a/tests/components/test_group.py b/tests/components/test_group.py
index 19ca2cbf7c5..8a3eeadcb14 100644
--- a/tests/components/test_group.py
+++ b/tests/components/test_group.py
@@ -7,18 +7,19 @@ Tests the group compoments.
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.const import (
     STATE_ON, STATE_OFF, STATE_HOME, STATE_UNKNOWN, ATTR_ICON, ATTR_HIDDEN)
 import homeassistant.components.group as group
 
+from tests.common import get_test_home_assistant
+
 
 class TestComponentsGroup(unittest.TestCase):
     """ Tests homeassistant.components.group module. """
 
     def setUp(self):  # pylint: disable=invalid-name
         """ Init needed objects. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
         self.hass.states.set('light.Bowl', STATE_ON)
         self.hass.states.set('light.Ceiling', STATE_OFF)
diff --git a/tests/components/test_introduction.py b/tests/components/test_introduction.py
index 4c7d104ba49..f4a53c65566 100644
--- a/tests/components/test_introduction.py
+++ b/tests/components/test_introduction.py
@@ -6,15 +6,16 @@ Test introduction.
 """
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.components import introduction
 
+from tests.common import get_test_home_assistant
+
 
 class TestIntroduction(unittest.TestCase):
     """ Test Introduction. """
 
     def setUp(self):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):
         """ Stop down stuff we started. """
diff --git a/tests/components/test_logbook.py b/tests/components/test_logbook.py
index b6bc764660d..f83ecd548f0 100644
--- a/tests/components/test_logbook.py
+++ b/tests/components/test_logbook.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
 import homeassistant.util.dt as dt_util
 from homeassistant.components import logbook
 
-from tests.common import mock_http_component
+from tests.common import mock_http_component, get_test_home_assistant
 
 
 class TestComponentHistory(unittest.TestCase):
@@ -22,7 +22,7 @@ class TestComponentHistory(unittest.TestCase):
 
     def setUp(self):
         """ Test setup method. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         mock_http_component(self.hass)
         self.assertTrue(logbook.setup(self.hass, {}))
 
diff --git a/tests/components/test_proximity.py b/tests/components/test_proximity.py
index d75f131d2de..7c7ae0b954f 100644
--- a/tests/components/test_proximity.py
+++ b/tests/components/test_proximity.py
@@ -4,15 +4,16 @@ tests.components.test_proximity
 
 Tests proximity component.
 """
-import homeassistant.core as ha
 from homeassistant.components import proximity
 
+from tests.common import get_test_home_assistant
+
 
 class TestProximity:
     """ Test the Proximity component. """
 
     def setup_method(self, method):
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.states.set(
             'zone.home', 'zoning',
             {
diff --git a/tests/components/test_shell_command.py b/tests/components/test_shell_command.py
index 6fdc671f5ad..cf0c09bb052 100644
--- a/tests/components/test_shell_command.py
+++ b/tests/components/test_shell_command.py
@@ -10,15 +10,16 @@ import unittest
 from unittest.mock import patch
 from subprocess import SubprocessError
 
-from homeassistant import core
 from homeassistant.components import shell_command
 
+from tests.common import get_test_home_assistant
+
 
 class TestShellCommand(unittest.TestCase):
     """ Test the demo module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = core.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/test_sun.py b/tests/components/test_sun.py
index 44f428dc9a0..3a1b6340ba0 100644
--- a/tests/components/test_sun.py
+++ b/tests/components/test_sun.py
@@ -14,12 +14,14 @@ import homeassistant.core as ha
 import homeassistant.util.dt as dt_util
 import homeassistant.components.sun as sun
 
+from tests.common import get_test_home_assistant
+
 
 class TestSun(unittest.TestCase):
     """ Test the sun module. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/test_updater.py b/tests/components/test_updater.py
index e1e2f5a7950..440974d4457 100644
--- a/tests/components/test_updater.py
+++ b/tests/components/test_updater.py
@@ -9,11 +9,10 @@ from unittest.mock import patch
 
 import requests
 
-import homeassistant.core as ha
 from homeassistant.const import __version__ as CURRENT_VERSION
 from homeassistant.components import updater
 import homeassistant.util.dt as dt_util
-from tests.common import fire_time_changed
+from tests.common import fire_time_changed, get_test_home_assistant
 
 NEW_VERSION = '10000.0'
 
@@ -22,7 +21,7 @@ class TestUpdater(unittest.TestCase):
     """ Test the demo lock. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/components/test_weblink.py b/tests/components/test_weblink.py
index f93a6ba0840..29809722e68 100644
--- a/tests/components/test_weblink.py
+++ b/tests/components/test_weblink.py
@@ -6,21 +6,22 @@ Tests weblink component.
 """
 import unittest
 
-import homeassistant.core as ha
 from homeassistant.components import weblink
 
+from tests.common import get_test_home_assistant
 
-class TestComponentHistory(unittest.TestCase):
+
+class TestComponentWeblink(unittest.TestCase):
     """ Tests homeassistant.components.history module. """
 
     def setUp(self):
         """ Test setup method. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):
         self.hass.stop()
 
-    def test_setup(self):
+    def test_entities_get_created(self):
         self.assertTrue(weblink.setup(self.hass, {
             weblink.DOMAIN: {
                 'entities': [
@@ -32,3 +33,8 @@ class TestComponentHistory(unittest.TestCase):
                 ]
             }
         }))
+
+        state = self.hass.states.get('weblink.my_router')
+
+        assert state is not None
+        assert state.state == 'http://127.0.0.1/'
diff --git a/tests/components/thermostat/test_heat_control.py b/tests/components/thermostat/test_heat_control.py
index aa5a43c9c0e..9d91d3c70cb 100644
--- a/tests/components/thermostat/test_heat_control.py
+++ b/tests/components/thermostat/test_heat_control.py
@@ -14,9 +14,10 @@ from homeassistant.const import (
     STATE_OFF,
     TEMP_CELCIUS,
 )
-import homeassistant.core as ha
 from homeassistant.components import thermostat
 
+from tests.common import get_test_home_assistant
+
 
 entity = 'thermostat.test'
 ent_sensor = 'sensor.test'
@@ -30,7 +31,7 @@ class TestThermostatHeatControl(unittest.TestCase):
     """ Test the Heat Control thermostat. """
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.config.temperature_unit = TEMP_CELCIUS
         thermostat.setup(self.hass, {'thermostat': {
             'platform': 'heat_control',
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index 37661623880..7e305454228 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -7,10 +7,11 @@ Tests the entity helper.
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
 
-import homeassistant.core as ha
 import homeassistant.helpers.entity as entity
 from homeassistant.const import ATTR_HIDDEN
 
+from tests.common import get_test_home_assistant
+
 
 class TestHelpersEntity(unittest.TestCase):
     """ Tests homeassistant.helpers.entity module. """
@@ -19,7 +20,7 @@ class TestHelpersEntity(unittest.TestCase):
         """ Init needed objects. """
         self.entity = entity.Entity()
         self.entity.entity_id = 'test.overwrite_hidden_true'
-        self.hass = self.entity.hass = ha.HomeAssistant()
+        self.hass = self.entity.hass = get_test_home_assistant()
         self.entity.update_ha_state()
 
     def tearDown(self):  # pylint: disable=invalid-name
diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py
index 3f97684984f..91cf252443c 100644
--- a/tests/helpers/test_event.py
+++ b/tests/helpers/test_event.py
@@ -24,6 +24,8 @@ from homeassistant.helpers.event import (
 from homeassistant.components import sun
 import homeassistant.util.dt as dt_util
 
+from tests.common import get_test_home_assistant
+
 
 class TestEventHelpers(unittest.TestCase):
     """
@@ -32,7 +34,7 @@ class TestEventHelpers(unittest.TestCase):
 
     def setUp(self):     # pylint: disable=invalid-name
         """ things to be run when tests are started. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
diff --git a/tests/helpers/test_event_decorators.py b/tests/helpers/test_event_decorators.py
index 1ef8c042e69..0d87be43740 100644
--- a/tests/helpers/test_event_decorators.py
+++ b/tests/helpers/test_event_decorators.py
@@ -19,6 +19,8 @@ from homeassistant.helpers.event_decorators import (
     track_sunrise, track_sunset)
 from homeassistant.components import sun
 
+from tests.common import get_test_home_assistant
+
 
 class TestEventDecoratorHelpers(unittest.TestCase):
     """
@@ -27,7 +29,7 @@ class TestEventDecoratorHelpers(unittest.TestCase):
 
     def setUp(self):     # pylint: disable=invalid-name
         """ things to be run when tests are started. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.states.set("light.Bowl", "on")
         self.hass.states.set("switch.AC", "off")
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 2fbe92f8023..52d146aa8c9 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -9,12 +9,14 @@ import os
 import tempfile
 import unittest
 
-from homeassistant import core, bootstrap
+from homeassistant import bootstrap
 from homeassistant.const import (__version__, CONF_LATITUDE, CONF_LONGITUDE,
                                  CONF_NAME, CONF_CUSTOMIZE)
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.entity import Entity
 
+from tests.common import get_test_home_assistant
+
 
 class TestBootstrap(unittest.TestCase):
     """ Test the bootstrap utils. """
@@ -53,7 +55,7 @@ class TestBootstrap(unittest.TestCase):
             with open(check_file, 'w'):
                 pass
 
-            hass = core.HomeAssistant()
+            hass = get_test_home_assistant()
             hass.config.config_dir = config_dir
 
             self.assertTrue(os.path.isfile(check_file))
@@ -74,7 +76,7 @@ class TestBootstrap(unittest.TestCase):
             with open(check_file, 'w'):
                 pass
 
-            hass = core.HomeAssistant()
+            hass = get_test_home_assistant()
             hass.config.config_dir = config_dir
 
             bootstrap.process_ha_config_upgrade(hass)
@@ -88,7 +90,7 @@ class TestBootstrap(unittest.TestCase):
                   CONF_NAME: 'Test',
                   CONF_CUSTOMIZE: {'test.test': {'hidden': True}}}
 
-        hass = core.HomeAssistant()
+        hass = get_test_home_assistant()
 
         bootstrap.process_ha_core_config(hass, config)
 
diff --git a/tests/test_core.py b/tests/test_core.py
index d1b2221998e..61bfddf7548 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -25,6 +25,8 @@ from homeassistant.const import (
     EVENT_STATE_CHANGED, ATTR_FRIENDLY_NAME, TEMP_CELCIUS,
     TEMP_FAHRENHEIT)
 
+from tests.common import get_test_home_assistant
+
 PST = pytz.timezone('America/Los_Angeles')
 
 
@@ -35,7 +37,7 @@ class TestHomeAssistant(unittest.TestCase):
 
     def setUp(self):     # pylint: disable=invalid-name
         """ things to be run when tests are started. """
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
         self.hass.states.set("light.Bowl", "on")
         self.hass.states.set("switch.AC", "off")
 
diff --git a/tests/test_remote.py b/tests/test_remote.py
index 4f2fb75e6c9..725ba25ac80 100644
--- a/tests/test_remote.py
+++ b/tests/test_remote.py
@@ -14,7 +14,7 @@ import homeassistant.remote as remote
 import homeassistant.components.http as http
 from homeassistant.const import HTTP_HEADER_HA_AUTH
 
-from tests.common import get_test_instance_port
+from tests.common import get_test_instance_port, get_test_home_assistant
 
 API_PASSWORD = "test1234"
 MASTER_PORT = get_test_instance_port()
@@ -38,7 +38,7 @@ def setUpModule(mock_get_local_ip):   # pylint: disable=invalid-name
     """ Initalizes a Home Assistant server and Slave instance. """
     global hass, slave, master_api, broken_api
 
-    hass = ha.HomeAssistant()
+    hass = get_test_home_assistant()
 
     hass.bus.listen('test_event', lambda _: _)
     hass.states.set('test.test', 'a_state')
diff --git a/tests/util/test_template.py b/tests/util/test_template.py
index 32189f899a7..09e0e154888 100644
--- a/tests/util/test_template.py
+++ b/tests/util/test_template.py
@@ -6,15 +6,16 @@ Tests Home Assistant template util methods.
 """
 # pylint: disable=too-many-public-methods
 import unittest
-import homeassistant.core as ha
 from homeassistant.exceptions import TemplateError
 from homeassistant.util import template
 
+from tests.common import get_test_home_assistant
+
 
 class TestUtilTemplate(unittest.TestCase):
 
     def setUp(self):  # pylint: disable=invalid-name
-        self.hass = ha.HomeAssistant()
+        self.hass = get_test_home_assistant()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """