diff --git a/tests/issue_submitter_tests.py b/tests/issue_submitter_tests.py
index ea8a7a495d1ba05bfdb6dd435442a4216014ffbe..79829f5b45821a1084e969a3e7e7f0422a4bad2c 100644
--- a/tests/issue_submitter_tests.py
+++ b/tests/issue_submitter_tests.py
@@ -17,29 +17,42 @@
 # You should have received a copy of the GNU General Public License
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
 
+"""
+Test exception logging
+"""
 
-import sys, os.path
+import sys
+import os.path
+import unittest
 
 sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), '../lib')))
 sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
-import unittest
-
 from sickbeard import logger
 from sickrage.helper.exceptions import ex
 
-def error():
+
+def exception_generator():
+    """
+    Dummy function to raise a fake exception and log it
+    """
     try:
         raise Exception('FAKE EXCEPTION')
-    except Exception as e:
-        logger.log(u"FAKE ERROR: " + ex(e), logger.ERROR)
-        logger.submit_errors()
+    except Exception as error:
+        logger.log(u"FAKE ERROR: " + ex(error), logger.ERROR)  # pylint: disable=no-member
+        logger.submit_errors()  # pylint: disable=no-member
         raise
 
 
 class IssueSubmitterBasicTests(unittest.TestCase):
+    """
+    Tests logging of exceptions
+    """
     def test_submitter(self):
-        self.assertRaises(Exception, error)
+        """
+        Test that an exception is raised
+        """
+        self.assertRaises(Exception, exception_generator)
 
 
 if __name__ == "__main__":
@@ -47,5 +60,6 @@ if __name__ == "__main__":
     print "STARTING - ISSUE SUBMITTER TESTS"
     print "=================="
     print "######################################################################"
-    suite = unittest.TestLoader().loadTestsFromTestCase(IssueSubmitterBasicTests)
-    unittest.TextTestRunner(verbosity=2).run(suite)
+
+    SUITE = unittest.TestLoader().loadTestsFromTestCase(IssueSubmitterBasicTests)
+    unittest.TextTestRunner(verbosity=2).run(SUITE)