diff --git a/tests/test_remote.py b/tests/test_remote.py
index 7c87bc4af33..a5a7c0aa2d6 100644
--- a/tests/test_remote.py
+++ b/tests/test_remote.py
@@ -42,7 +42,7 @@ def setUpModule():   # pylint: disable=invalid-name
     bootstrap.setup_component(
         hass, http.DOMAIN,
         {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
-         http.CONF_SERVER_PORT: MASTER_PORT}})
+                       http.CONF_SERVER_PORT: MASTER_PORT}})
 
     bootstrap.setup_component(hass, 'api')
 
@@ -57,7 +57,7 @@ def setUpModule():   # pylint: disable=invalid-name
     bootstrap.setup_component(
         slave, http.DOMAIN,
         {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
-         http.CONF_SERVER_PORT: SLAVE_PORT}})
+                       http.CONF_SERVER_PORT: SLAVE_PORT}})
 
     slave.start()
 
@@ -109,7 +109,7 @@ class TestRemoteMethods(unittest.TestCase):
             """Helper method that will verify our event got called."""
             test_value.append(1)
 
-        hass.bus.listen_once("test.event_no_data", listener)
+        hass.bus.listen("test.event_no_data", listener)
         remote.fire_event(master_api, "test.event_no_data")
         hass.pool.block_till_done()
         self.assertEqual(1, len(test_value))
@@ -150,7 +150,7 @@ class TestRemoteMethods(unittest.TestCase):
         self.assertFalse(remote.set_state(broken_api, 'test.test', 'set_test'))
 
     def test_set_state_with_push(self):
-        """TestPython API set_state with push option."""
+        """Test Python API set_state with push option."""
         events = []
         hass.bus.listen(EVENT_STATE_CHANGED, events.append)
 
@@ -259,11 +259,13 @@ class TestRemoteClasses(unittest.TestCase):
         """Remove statemachine from master."""
         hass.states.set("remote.master_remove", "remove me!")
         hass.pool.block_till_done()
+        slave.pool.block_till_done()
 
         self.assertIn('remote.master_remove', slave.states.entity_ids())
 
         hass.states.remove("remote.master_remove")
         hass.pool.block_till_done()
+        slave.pool.block_till_done()
 
         self.assertNotIn('remote.master_remove', slave.states.entity_ids())
 
@@ -282,13 +284,11 @@ class TestRemoteClasses(unittest.TestCase):
 
     def test_eventbus_fire(self):
         """Test if events fired from the eventbus get fired."""
-        test_value = []
+        hass_call = []
+        slave_call = []
 
-        def listener(event):
-            """Helper method that will verify our event got called."""
-            test_value.append(1)
-
-        slave.bus.listen_once("test.event_no_data", listener)
+        hass.bus.listen("test.event_no_data", lambda _: hass_call.append(1))
+        slave.bus.listen("test.event_no_data", lambda _: slave_call.append(1))
         slave.bus.fire("test.event_no_data")
 
         # Wait till slave tells master
@@ -296,7 +296,8 @@ class TestRemoteClasses(unittest.TestCase):
         # Wait till master gives updated event
         hass.pool.block_till_done()
 
-        self.assertEqual(1, len(test_value))
+        self.assertEqual(1, len(hass_call))
+        self.assertEqual(1, len(slave_call))
 
     def test_get_config(self):
         """Test the return of the configuration."""