diff --git a/.coveragerc b/.coveragerc
index 1c7b05c7d24..69755cb8a62 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,18 +5,18 @@ omit =
     homeassistant/__main__.py
 
     # omit pieces of code that rely on external devices being present
-    homeassistant/components/alarm_control_panel/alarmdotcom.py
-    homeassistant/components/alarm_control_panel/nx584.py
+    homeassistant/components/apcupsd.py
+    homeassistant/components/*/apcupsd.py
 
     homeassistant/components/arduino.py
     homeassistant/components/*/arduino.py
 
-    homeassistant/components/apcupsd.py
-    homeassistant/components/*/apcupsd.py
-
     homeassistant/components/bloomsky.py
     homeassistant/components/*/bloomsky.py
 
+    homeassistant/components/ecobee.py
+    homeassistant/components/*/ecobee.py
+
     homeassistant/components/insteon_hub.py
     homeassistant/components/*/insteon_hub.py
 
@@ -26,33 +26,6 @@ omit =
     homeassistant/components/modbus.py
     homeassistant/components/*/modbus.py
 
-    homeassistant/components/tellstick.py
-    homeassistant/components/*/tellstick.py
-
-    homeassistant/components/tellduslive.py
-    homeassistant/components/*/tellduslive.py
-
-    homeassistant/components/vera.py
-    homeassistant/components/*/vera.py
-
-    homeassistant/components/ecobee.py
-    homeassistant/components/*/ecobee.py
-
-    homeassistant/components/verisure.py
-    homeassistant/components/*/verisure.py
-
-    homeassistant/components/wemo.py
-    homeassistant/components/*/wemo.py
-
-    homeassistant/components/wink.py
-    homeassistant/components/*/wink.py
-
-    homeassistant/components/zigbee.py
-    homeassistant/components/*/zigbee.py
-
-    homeassistant/components/zwave.py
-    homeassistant/components/*/zwave.py
-
     homeassistant/components/mysensors.py
     homeassistant/components/*/mysensors.py
 
@@ -65,13 +38,36 @@ omit =
     homeassistant/components/scsgate.py
     homeassistant/components/*/scsgate.py
 
-    homeassistant/components/upnp.py
-    homeassistant/components/zeroconf.py
+    homeassistant/components/tellduslive.py
+    homeassistant/components/*/tellduslive.py
+
+    homeassistant/components/tellstick.py
+    homeassistant/components/*/tellstick.py
 
     homeassistant/components/*/thinkingcleaner.py
 
+    homeassistant/components/vera.py
+    homeassistant/components/*/vera.py
+
+    homeassistant/components/verisure.py
+    homeassistant/components/*/verisure.py
+
     homeassistant/components/*/webostv.py
 
+    homeassistant/components/wemo.py
+    homeassistant/components/*/wemo.py
+
+    homeassistant/components/wink.py
+    homeassistant/components/*/wink.py
+
+    homeassistant/components/zigbee.py
+    homeassistant/components/*/zigbee.py
+
+    homeassistant/components/zwave.py
+    homeassistant/components/*/zwave.py
+
+    homeassistant/components/alarm_control_panel/alarmdotcom.py
+    homeassistant/components/alarm_control_panel/nx584.py
     homeassistant/components/binary_sensor/arest.py
     homeassistant/components/binary_sensor/rest.py
     homeassistant/components/browser.py
@@ -112,17 +108,17 @@ omit =
     homeassistant/components/media_player/itunes.py
     homeassistant/components/media_player/kodi.py
     homeassistant/components/media_player/mpd.py
+    homeassistant/components/media_player/onkyo.py
+    homeassistant/components/media_player/panasonic_viera.py
     homeassistant/components/media_player/plex.py
     homeassistant/components/media_player/samsungtv.py
     homeassistant/components/media_player/snapcast.py
     homeassistant/components/media_player/sonos.py
     homeassistant/components/media_player/squeezebox.py
-    homeassistant/components/media_player/onkyo.py
-    homeassistant/components/media_player/panasonic_viera.py
     homeassistant/components/media_player/yamaha.py
     homeassistant/components/notify/free_mobile.py
-    homeassistant/components/notify/googlevoice.py
     homeassistant/components/notify/gntp.py
+    homeassistant/components/notify/googlevoice.py
     homeassistant/components/notify/instapush.py
     homeassistant/components/notify/message_bird.py
     homeassistant/components/notify/nma.py
@@ -149,10 +145,10 @@ omit =
     homeassistant/components/sensor/forecast.py
     homeassistant/components/sensor/glances.py
     homeassistant/components/sensor/gtfs.py
-    homeassistant/components/sensor/netatmo.py
-    homeassistant/components/sensor/nzbget.py
     homeassistant/components/sensor/loopenergy.py
+    homeassistant/components/sensor/netatmo.py
     homeassistant/components/sensor/neurio_energy.py
+    homeassistant/components/sensor/nzbget.py
     homeassistant/components/sensor/onewire.py
     homeassistant/components/sensor/openweathermap.py
     homeassistant/components/sensor/rest.py
@@ -183,6 +179,8 @@ omit =
     homeassistant/components/thermostat/homematic.py
     homeassistant/components/thermostat/proliphix.py
     homeassistant/components/thermostat/radiotherm.py
+    homeassistant/components/upnp.py
+    homeassistant/components/zeroconf.py
 
 
 [report]