diff --git a/.travis.yml b/.travis.yml
index 9cf13f2c831..f4c696a2236 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ matrix:
       env: TOXENV=typing
     - python: "3.5"
       env: TOXENV=py35
+    - python: "3.6"
+      env: TOXENV=py36
   allow_failures:
     - python: "3.5"
       env: TOXENV=typing
diff --git a/tests/components/sensor/test_dsmr.py b/tests/components/sensor/test_dsmr.py
index e76b26a811b..35e224253ee 100644
--- a/tests/components/sensor/test_dsmr.py
+++ b/tests/components/sensor/test_dsmr.py
@@ -11,7 +11,7 @@ from unittest.mock import Mock
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components.sensor.dsmr import DerivativeDSMREntity
 from homeassistant.const import STATE_UNKNOWN
-from tests.common import assert_setup_component
+from tests.common import assert_setup_component, mock_coro
 
 
 @asyncio.coroutine
@@ -35,7 +35,7 @@ def test_default_setup(hass, monkeypatch):
     }
 
     # mock for injecting DSMR telegram
-    dsmr = Mock(return_value=Mock())
+    dsmr = Mock(return_value=mock_coro([Mock(), None]))
     monkeypatch.setattr('dsmr_parser.protocol.create_dsmr_reader', dsmr)
 
     with assert_setup_component(1):
@@ -66,6 +66,7 @@ def test_default_setup(hass, monkeypatch):
     assert power_tariff.attributes.get('unit_of_measurement') is None
 
 
+@asyncio.coroutine
 def test_derivative():
     """Test calculation of derivative value."""
     from dsmr_parser.objects import MBusObject
diff --git a/tests/components/sensor/test_rest.py b/tests/components/sensor/test_rest.py
index ab5a255c885..4abfb2d4551 100644
--- a/tests/components/sensor/test_rest.py
+++ b/tests/components/sensor/test_rest.py
@@ -200,7 +200,7 @@ class TestRestData(unittest.TestCase):
         self.rest.update()
         self.assertEqual('test data', self.rest.data)
 
-    @patch('requests.get', side_effect=RequestException)
+    @patch('requests.Session', side_effect=RequestException)
     def test_update_request_exception(self, mock_req):
         """Test update when a request exception occurs."""
         self.rest.update()
diff --git a/tests/util/test_async.py b/tests/util/test_async.py
index a3da7e7f4e1..1d6e669e1d6 100644
--- a/tests/util/test_async.py
+++ b/tests/util/test_async.py
@@ -87,6 +87,7 @@ class RunCoroutineThreadsafeTests(test_utils.TestCase):
 
     def setUp(self):
         """Test setup method."""
+        super().setUp()
         self.loop = asyncio.new_event_loop()
         self.set_event_loop(self.loop)  # Will cleanup properly
 
diff --git a/tox.ini b/tox.ini
index a5f6ea45f53..3da1de04bf3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py35, lint, requirements, typing
+envlist = py34, py35, py36, lint, requirements, typing
 skip_missing_interpreters = True
 
 [testenv]