diff --git a/homeassistant/components/mqtt/server.py b/homeassistant/components/mqtt/server.py
index 5fc365342aec6b83819326ecfea5c570b5148f58..57da85fe5f6d22434fe75c39170fb4bf8e484a79 100644
--- a/homeassistant/components/mqtt/server.py
+++ b/homeassistant/components/mqtt/server.py
@@ -13,7 +13,7 @@ import voluptuous as vol
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['hbmqtt==0.9.2']
+REQUIREMENTS = ['hbmqtt==0.9.4']
 DEPENDENCIES = ['http']
 
 # None allows custom config to be created through generate_config
diff --git a/requirements_all.txt b/requirements_all.txt
index 8c2080d12fac0d9c9a639c1721acff2f5ad7e832..db244cc8cfbfa51915c9912f9128243e7915e561 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -430,7 +430,7 @@ hangups==0.4.5
 haversine==0.4.5
 
 # homeassistant.components.mqtt.server
-hbmqtt==0.9.2
+hbmqtt==0.9.4
 
 # homeassistant.components.climate.heatmiser
 heatmiserV3==0.9.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index bd921085461a9cf851f1ebc84a76f7bc9c48dc87..446e3d056a39fe31458aaab4fc260fab5f6c2406 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -78,7 +78,7 @@ hangups==0.4.5
 haversine==0.4.5
 
 # homeassistant.components.mqtt.server
-hbmqtt==0.9.2
+hbmqtt==0.9.4
 
 # homeassistant.components.binary_sensor.workday
 holidays==0.9.6
diff --git a/tests/components/mqtt/test_server.py b/tests/components/mqtt/test_server.py
index c761c47542fd82a5555efaf2be194d6a0fbe1808..976fdd3d15cd98de7107a97ef734a0e759ce990d 100644
--- a/tests/components/mqtt/test_server.py
+++ b/tests/components/mqtt/test_server.py
@@ -1,8 +1,5 @@
 """The tests for the MQTT component embedded server."""
 from unittest.mock import Mock, MagicMock, patch
-import sys
-
-import pytest
 
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.setup import setup_component
@@ -11,9 +8,6 @@ import homeassistant.components.mqtt as mqtt
 from tests.common import get_test_home_assistant, mock_coro
 
 
-# Until https://github.com/beerfactory/hbmqtt/pull/139 is released
-@pytest.mark.skipif(sys.version_info[:2] >= (3, 7),
-                    reason='Package incompatible with Python 3.7')
 class TestMQTT:
     """Test the MQTT component."""