diff --git a/test/test_component_group.py b/test/test_component_group.py
index d44a03cedc2..2af99e3c209 100644
--- a/test/test_component_group.py
+++ b/test/test_component_group.py
@@ -6,12 +6,18 @@ Tests the group compoments.
 """
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
+import logging
 
 import homeassistant as ha
 import homeassistant.components as comps
 import homeassistant.components.group as group
 
 
+def setUpModule():   # pylint: disable=invalid-name
+    """ Setup to ignore group errors. """
+    logging.disable(logging.CRITICAL)
+
+
 class TestComponentsGroup(unittest.TestCase):
     """ Tests homeassistant.components.group module. """
 
diff --git a/test/test_component_http.py b/test/test_component_http.py
index 047e77bcfbf..640600becca 100644
--- a/test/test_component_http.py
+++ b/test/test_component_http.py
@@ -8,7 +8,6 @@ Tests Home Assistant HTTP component does what it should do.
 import re
 import unittest
 import json
-import logging
 
 import requests
 
@@ -27,13 +26,15 @@ HTTP_BASE_URL = "http://127.0.0.1:{}".format(SERVER_PORT)
 
 HA_HEADERS = {remote.AUTH_HEADER: API_PASSWORD}
 
+hass = None
+
 
 def _url(path=""):
     """ Helper method to generate urls. """
     return HTTP_BASE_URL + path
 
 
-def setUpModule():
+def setUpModule():   # pylint: disable=invalid-name
     """ Initalizes a Home Assistant server. """
     global hass
 
@@ -49,7 +50,7 @@ def setUpModule():
     hass.start()
 
 
-def tearDownModule():
+def tearDownModule():   # pylint: disable=invalid-name
     """ Stops the Home Assistant server. """
     global hass
 
diff --git a/test/test_core.py b/test/test_core.py
index 5b94e7c9833..1bb08365380 100644
--- a/test/test_core.py
+++ b/test/test_core.py
@@ -5,6 +5,7 @@ test.test_core
 Provides tests to verify that Home Assistant core works.
 """
 # pylint: disable=protected-access,too-many-public-methods
+# pylint: disable=too-few-public-methods
 import os
 import unittest
 import time
diff --git a/test/test_loader.py b/test/test_loader.py
index fb0a698280c..122021afadb 100644
--- a/test/test_loader.py
+++ b/test/test_loader.py
@@ -4,7 +4,7 @@ test.test_loader
 
 Provides tests to verify that we can load components.
 """
-# pylint: disable=too-many-public-methods
+# pylint: disable=too-many-public-methods,protected-access
 import unittest
 
 import homeassistant as ha
diff --git a/test/test_remote.py b/test/test_remote.py
index d5e77c80ac9..0d0f92c6a33 100644
--- a/test/test_remote.py
+++ b/test/test_remote.py
@@ -6,7 +6,6 @@ Tests Home Assistant remote methods and classes.
 """
 # pylint: disable=protected-access,too-many-public-methods
 import unittest
-import logging
 
 import homeassistant as ha
 import homeassistant.remote as remote
@@ -18,13 +17,15 @@ HTTP_BASE_URL = "http://127.0.0.1:{}".format(remote.SERVER_PORT)
 
 HA_HEADERS = {remote.AUTH_HEADER: API_PASSWORD}
 
+hass, slave, master_api = None, None, None
+
 
 def _url(path=""):
     """ Helper method to generate urls. """
     return HTTP_BASE_URL + path
 
 
-def setUpModule():
+def setUpModule():   # pylint: disable=invalid-name
     """ Initalizes a Home Assistant server and Slave instance. """
     global hass, slave, master_api
 
@@ -51,7 +52,7 @@ def setUpModule():
     slave.start()
 
 
-def tearDownModule():
+def tearDownModule():   # pylint: disable=invalid-name
     """ Stops the Home Assistant server and slave. """
     global hass, slave