diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index d4d8fe0216c..1c30de918e3 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -29,7 +29,7 @@ from .const import (
 from .util import (
     show_setup_message, validate_entity_config, validate_media_player_features)
 
-REQUIREMENTS = ['HAP-python==2.3.0']
+REQUIREMENTS = ['HAP-python==2.2.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/homekit/type_switches.py b/homeassistant/components/homekit/type_switches.py
index 839abe5a580..288da65a4af 100644
--- a/homeassistant/components/homekit/type_switches.py
+++ b/homeassistant/components/homekit/type_switches.py
@@ -2,8 +2,7 @@
 import logging
 
 from pyhap.const import (
-    CATEGORY_FAUCET, CATEGORY_OUTLET, CATEGORY_SHOWER_HEAD,
-    CATEGORY_SPRINKLER, CATEGORY_SWITCH)
+    CATEGORY_OUTLET, CATEGORY_SWITCH)
 
 from homeassistant.components.switch import DOMAIN
 from homeassistant.const import (
@@ -19,6 +18,10 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
+CATEGORY_SPRINKLER = 28
+CATEGORY_FAUCET = 29
+CATEGORY_SHOWER_HEAD = 30
+
 VALVE_TYPE = {
     TYPE_FAUCET: (CATEGORY_FAUCET, 3),
     TYPE_SHOWER: (CATEGORY_SHOWER_HEAD, 2),
diff --git a/requirements_all.txt b/requirements_all.txt
index dfbfc951066..e6b1d258c07 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -35,7 +35,7 @@ Adafruit-SHT31==1.0.2
 DoorBirdPy==0.1.3
 
 # homeassistant.components.homekit
-HAP-python==2.3.0
+HAP-python==2.2.2
 
 # homeassistant.components.notify.mastodon
 Mastodon.py==1.3.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index f17a366103d..8035918d3f2 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -19,7 +19,7 @@ requests_mock==1.5.2
 
 
 # homeassistant.components.homekit
-HAP-python==2.3.0
+HAP-python==2.2.2
 
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.1.3
diff --git a/tests/components/homekit/test_type_locks.py b/tests/components/homekit/test_type_locks.py
index 8132099bd3e..e7e52c65559 100644
--- a/tests/components/homekit/test_type_locks.py
+++ b/tests/components/homekit/test_type_locks.py
@@ -82,7 +82,6 @@ async def test_no_code(hass, hk_driver, config, events):
     # Set from HomeKit
     call_lock = async_mock_service(hass, DOMAIN, 'lock')
 
-    acc.char_target_state.value = 0
     await hass.async_add_job(acc.char_target_state.client_update_value, 1)
     await hass.async_block_till_done()
     assert call_lock
diff --git a/tests/components/homekit/test_type_media_players.py b/tests/components/homekit/test_type_media_players.py
index 745e4c162bc..6b23b3cc58e 100644
--- a/tests/components/homekit/test_type_media_players.py
+++ b/tests/components/homekit/test_type_media_players.py
@@ -64,7 +64,6 @@ async def test_media_player_set_state(hass, hk_driver, events):
     call_media_stop = async_mock_service(hass, DOMAIN, 'media_stop')
     call_toggle_mute = async_mock_service(hass, DOMAIN, 'volume_mute')
 
-    acc.chars[FEATURE_ON_OFF].value = False
     await hass.async_add_job(acc.chars[FEATURE_ON_OFF]
                              .client_update_value, True)
     await hass.async_block_till_done()