diff --git a/.pylintrc-lib b/.pylintrc-lib
index f92fab9fa5a685d1614cf4d154aa2c9028d31c61..5f9cb4ab207c0ea5deca41cd6d5b3272751bf6e2 100644
--- a/.pylintrc-lib
+++ b/.pylintrc-lib
@@ -136,7 +136,7 @@ function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 # Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
+good-names=i,j,k,ex,Run,_,maxDiff
 
 # Include a hint for the correct naming format with invalid-name
 include-naming-hint=no
diff --git a/lib/mentat/datatype/test_internal.py b/lib/mentat/datatype/test_internal.py
index 71568760d23359e6ce7fa220f709ab206dfca2ed..9acc6e1dc1a94004427bb9868f4634d12de90d9a 100644
--- a/lib/mentat/datatype/test_internal.py
+++ b/lib/mentat/datatype/test_internal.py
@@ -222,7 +222,7 @@ class TestMentatDatatypeInternal(unittest.TestCase):
         """
         Perform tests of parsing network records.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         self.assertEqual(mentat.datatype.internal.to_net4('192.168.1.0-192.168.1.255'), ipranges.IP4Range('192.168.1.0-192.168.1.255'))
         with self.assertRaises(ValueError):
@@ -270,7 +270,7 @@ class TestMentatDatatypeInternal(unittest.TestCase):
         """
         Perform tests of parsing network records.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         for r in self.nr_records_raw:
             nr = mentat.datatype.internal.t_network_record(r)
@@ -284,7 +284,7 @@ class TestMentatDatatypeInternal(unittest.TestCase):
         """
         Perform tests of parsing abuse groups.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abg = mentat.datatype.internal.AbuseGroup(self.group_raw)
         self.assertEqual(abg['_id'], 'abuse@muni.cz')
@@ -298,7 +298,7 @@ class TestMentatDatatypeInternal(unittest.TestCase):
         """
         Perform tests of parsing user accounts.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         uac = mentat.datatype.internal.User(self.user_raw)
         self.assertEqual(uac['_id'], 'mach@cesnet.cz')
diff --git a/lib/mentat/datatype/test_mongodb.py b/lib/mentat/datatype/test_mongodb.py
index ca4340cb35df606e0ee68c4c221ed866af46f36e..e4610dfc6a40c225ad7236917c20e4bb3d462f88 100644
--- a/lib/mentat/datatype/test_mongodb.py
+++ b/lib/mentat/datatype/test_mongodb.py
@@ -221,13 +221,13 @@ class TestMentatDatatypeMongodb(unittest.TestCase):
         """
         Perform tests of parsing network records.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
     def test_02_network_record(self):
         """
         Perform tests of parsing network records.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         for r in self.nr_records_raw:
             nr = mentat.datatype.internal.t_network_record(r)
@@ -247,7 +247,7 @@ class TestMentatDatatypeMongodb(unittest.TestCase):
         """
         Perform tests of parsing abuse groups.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abg = mentat.datatype.internal.AbuseGroup(self.group_raw)
         self.assertEqual(abg['_id'], 'abuse@muni.cz')
@@ -261,7 +261,7 @@ class TestMentatDatatypeMongodb(unittest.TestCase):
         """
         Perform tests of parsing abuse groups.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abg = mentat.datatype.internal.AbuseGroup(self.group_empty_raw)
         self.assertEqual(abg['_id'], 'abuse@cesnet.cz')
@@ -279,7 +279,7 @@ class TestMentatDatatypeMongodb(unittest.TestCase):
         """
         Perform tests of parsing abuse groups.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abg = mentat.datatype.internal.AbuseGroup(self.group_raw)
         self.assertEqual(abg['_id'], 'abuse@muni.cz')
@@ -297,7 +297,7 @@ class TestMentatDatatypeMongodb(unittest.TestCase):
         """
         Perform tests of parsing user accounts.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         uac = mentat.datatype.internal.User(self.user_raw)
         self.assertEqual(uac['_id'], 'mach@cesnet.cz')
diff --git a/lib/mentat/datatype/test_sqldb.py b/lib/mentat/datatype/test_sqldb.py
index 7b9547f5e44e526783eb4d2207290690176c1190..e49e740862fd161c5ff52dc7f341973a044253f4 100644
--- a/lib/mentat/datatype/test_sqldb.py
+++ b/lib/mentat/datatype/test_sqldb.py
@@ -63,7 +63,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.UserModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         user1 = UserModel(login = 'user1@cesnet.cz', fullname = 'First User',  email = 'user1@cesnet.cz', organization = 'CESNET, z.s.p.o.')
         user2 = UserModel(login = 'user2@cesnet.cz', fullname = 'Second User', email = 'user2@cesnet.cz', organization = 'CESNET, z.s.p.o.', roles = ['admin'])
@@ -121,7 +121,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.GroupModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         group1 = GroupModel(name = 'abuse@cesnet.cz',  source = 'manual', description = 'CESNET, z.s.p.o.')
         group2 = GroupModel(name = 'abuse@domain.org', source = 'manual', description = 'Domain Organization', parent = group1)
@@ -169,7 +169,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform tests of group members and managers.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         user1 = UserModel(login = 'user1@cesnet.cz', fullname = 'First User',  email = 'user1@cesnet.cz', organization = 'CESNET, z.s.p.o.')
         user2 = UserModel(login = 'user2@cesnet.cz', fullname = 'Second User', email = 'user2@cesnet.cz', organization = 'CESNET, z.s.p.o.', roles = ['admin'])
@@ -221,7 +221,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.NetworkModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         group1 = GroupModel(name = 'abuse@cesnet.cz',  source = 'manual', description = 'CESNET, z.s.p.o.')
 
@@ -274,7 +274,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.FilterModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         group1 = GroupModel(name = 'abuse@cesnet.cz',  source = 'manual', description = 'CESNET, z.s.p.o.')
 
@@ -324,7 +324,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.SettingsReportingModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         group1 = GroupModel(name = 'abuse@cesnet.cz',  source = 'manual', description = 'CESNET, z.s.p.o.')
 
@@ -372,7 +372,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.EventStatisticsModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         dt_from  = datetime.datetime(2017,1,1,12,0,0)
         dt_to    = datetime.datetime(2017,1,1,12,5,0)
@@ -407,7 +407,7 @@ class TestMentatDatatypeSqldb(unittest.TestCase):
         """
         Perform initial minimal tests of :py:class:`mentat.datatype.sqldb.EventReportModel`.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         group = GroupModel(name = 'abuse@cesnet.cz',  source = 'manual', description = 'CESNET, z.s.p.o.')
 
diff --git a/lib/mentat/idea/test_internal.py b/lib/mentat/idea/test_internal.py
index d4e41bc4a90e45a7a1587b58657debd9965298b4..25bbf1471a2be9ab885d41446a8ff542cb416317 100644
--- a/lib/mentat/idea/test_internal.py
+++ b/lib/mentat/idea/test_internal.py
@@ -153,7 +153,7 @@ class TestMentatIdeaInternal(unittest.TestCase):
         """
         Perform basic parsing and conversion tests from raw JSON.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         idea_internal_1 = mentat.idea.internal.Idea(self.idea_raw_1)
         if self.verbose:
@@ -179,7 +179,7 @@ class TestMentatIdeaInternal(unittest.TestCase):
         Perform basic parsing and conversion tests from ``idea.lite.Idea``. For
         the purposes of comparison, the ``idea.lite.Idea`` class is also tested here.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         idea_lite_1 = idea.lite.Idea(self.idea_raw_1)
         if self.verbose:
@@ -221,7 +221,7 @@ class TestMentatIdeaInternal(unittest.TestCase):
         """
         Perform tests of message convenience accessors.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         idea_internal_1 = mentat.idea.internal.Idea(self.idea_raw_1)
         if self.verbose:
diff --git a/lib/mentat/idea/test_jsondict.py b/lib/mentat/idea/test_jsondict.py
index 9eddf1080b85035cb8e6cc7982d9292ee37da850..89c9f0060ded22e2b56d400ed964678fb6b25cf0 100644
--- a/lib/mentat/idea/test_jsondict.py
+++ b/lib/mentat/idea/test_jsondict.py
@@ -113,7 +113,7 @@ class TestMentatIdeaJSON(unittest.TestCase):
         """
         Perfom isolated *Timestamp* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -132,7 +132,7 @@ class TestMentatIdeaJSON(unittest.TestCase):
         """
         Perfom isolated *Net4* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -161,7 +161,7 @@ class TestMentatIdeaJSON(unittest.TestCase):
         """
         Perfom isolated *Net6* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -192,7 +192,7 @@ class TestMentatIdeaJSON(unittest.TestCase):
         messages. For the purposes of comparison, the ``menat.idea.internal.Idea`` class
         is also tested here.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         #
         # Test conversions of raw JSON IDEA into 'mentat.idea.internal.Idea'.
diff --git a/lib/mentat/idea/test_mongodb.py b/lib/mentat/idea/test_mongodb.py
index 220e03eff8ab66c5957718bf2b261afec6ca598c..6cf89b8029b790df07bda89fb3cdbe295baf4927 100644
--- a/lib/mentat/idea/test_mongodb.py
+++ b/lib/mentat/idea/test_mongodb.py
@@ -126,7 +126,7 @@ class TestMentatIdeaMongodb(unittest.TestCase):
         """
         Perfom isolated *Timestamp* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -161,7 +161,7 @@ class TestMentatIdeaMongodb(unittest.TestCase):
         """
         Perfom isolated *Net4* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -210,7 +210,7 @@ class TestMentatIdeaMongodb(unittest.TestCase):
         """
         Perfom isolated *Net6* conversion tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests = [
             [
@@ -260,7 +260,7 @@ class TestMentatIdeaMongodb(unittest.TestCase):
         Perform basic parsing and conversion tests. For the purposes of
         comparison, the ``idea.lite.Idea`` class is also tested here.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         #
         # Test conversions of raw JSON IDEA into 'mentat.idea.internal.Idea'.
@@ -334,7 +334,7 @@ class TestMentatIdeaMongodb(unittest.TestCase):
         Perfom conversions from IDEA alerts stored into database by legacy
         Perl-based code.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         tests_ts   = []
         tests_net4 = []
diff --git a/lib/mentat/idea/test_sqldb.py b/lib/mentat/idea/test_sqldb.py
index 5f54f35964cc4481aafcf0a2b411ddea37ed1a92..e8720cc24696765b5e0879b44f1dcdeb3f72f033 100644
--- a/lib/mentat/idea/test_sqldb.py
+++ b/lib/mentat/idea/test_sqldb.py
@@ -120,7 +120,7 @@ class TestMentatIdeaJSON(unittest.TestCase):
         messages. For the purposes of comparison, the ``menat.idea.internal.Idea`` class
         is also tested here.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         #
         # Test conversions of raw JSON IDEA into 'mentat.idea.internal.Idea'.
diff --git a/lib/mentat/reports/test_event.py b/lib/mentat/reports/test_event.py
index e2db701cfc0ba8153052ab8249b247d27229a0b9..3ba5205770f70fdaf25beb3bc3ad5f7c8b07734a 100644
--- a/lib/mentat/reports/test_event.py
+++ b/lib/mentat/reports/test_event.py
@@ -181,7 +181,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter._save_to_json_files` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         report_file = 'utest_mentat_reports_event.json'
         report_path = os.path.join(REPORTS_DIR, report_file)
@@ -206,7 +206,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter._save_to_csv_files` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         report_file = 'utest_mentat_reports_event.csv'
         report_path = os.path.join(REPORTS_DIR, report_file)
@@ -231,7 +231,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter._save_to_file` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         report_file = 'utest_mentat_reports_event.txt'
         report_path = os.path.join(REPORTS_DIR, report_file)
@@ -252,7 +252,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter.aggregate_events_by_source` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
@@ -269,7 +269,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter.aggregate_events_for_summary` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
@@ -289,7 +289,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.event.EventReporter.aggregate_events_for_extra` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         events_aggr = self.reporter.aggregate_events_for_extra(self.ideas_obj)
         self.assertEqual(list(sorted(events_aggr.keys())), ['class01', 'class02'])
@@ -300,7 +300,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:class:`mentat.reports.event.EventReporter.filter_events` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
@@ -333,7 +333,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:class:`mentat.reports.event.EventReporter.fetch_severity_events` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
@@ -369,7 +369,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:class:`mentat.reports.event.EventReporter.render_report_summary` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
@@ -417,7 +417,7 @@ class TestMentatReportsEvent(unittest.TestCase):
         """
         Test :py:class:`mentat.reports.event.EventReporter.render_report_summary` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
diff --git a/lib/mentat/reports/test_utils.py b/lib/mentat/reports/test_utils.py
index ffca2ee14d165a981d4d16ee3fac6bc663057313..91d36828528f0a20f5038512480f7cbf5fa4b789 100644
--- a/lib/mentat/reports/test_utils.py
+++ b/lib/mentat/reports/test_utils.py
@@ -173,7 +173,7 @@ class TestMentatReportsUtils(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.utils.ThresholdingCache._generate_cache_keys` function.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         self.assertEqual(
             self.stcache._generate_cache_keys(self.ideas_raw[0]), # pylint: disable=locally-disabled,protected-access
@@ -198,7 +198,7 @@ class TestMentatReportsUtils(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.utils.NoThresholdingCache` class.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         ttltime = datetime.datetime.utcnow()
         relapsetime = ttltime - datetime.timedelta(seconds = 600)
@@ -216,7 +216,7 @@ class TestMentatReportsUtils(unittest.TestCase):
         """
         Test :py:func:`mentat.reports.utils.StorageThresholdingCache` class.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         thrtime = datetime.datetime.utcnow()
         reltime = thrtime - datetime.timedelta(seconds = 300)
@@ -250,7 +250,7 @@ class TestMentatReportsUtils(unittest.TestCase):
         """
         Test :py:class:`mentat.reports.utils.ReportingSettings` class.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         abuse_group = self.sqlstorage.session.query(GroupModel).filter(GroupModel.name == 'abuse@cesnet.cz').one()
         self.sqlstorage.session.commit()
diff --git a/lib/mentat/services/test_eventstorage.py b/lib/mentat/services/test_eventstorage.py
index b22d33d562c25e84764964cc4d9241bf33ca4dbd..cdbe9e75d8260592d63180c8c01a88c6a4ad8219 100644
--- a/lib/mentat/services/test_eventstorage.py
+++ b/lib/mentat/services/test_eventstorage.py
@@ -119,7 +119,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform the basic tests of storage service.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = 'mentat_utest',
@@ -137,7 +137,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform the basic tests of storage service manager.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         manager = mentat.services.eventstorage.EventStorageServiceManager(
             {
@@ -170,7 +170,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform the basic tests of module service.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         mentat.services.eventstorage.init(
             {
@@ -205,7 +205,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform the basic event create,read,delete tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = 'mentat_utest',
@@ -236,7 +236,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various query building tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -521,7 +521,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various event search tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -911,7 +911,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various event count tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -966,7 +966,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various event delete tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -1023,7 +1023,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various distinct values tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -1057,7 +1057,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various thresholding cache tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
@@ -1088,7 +1088,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform various relapse tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         storage = mentat.services.eventstorage.EventStorageService(
             dbname   = "mentat_utest",
diff --git a/lib/mentat/test_system.py b/lib/mentat/test_system.py
index 1c02f228b58931d22767f82d65b47a78f8bfb7bc..60bb06abed18333aa34107ca7eee4c2a5b11a3d1 100644
--- a/lib/mentat/test_system.py
+++ b/lib/mentat/test_system.py
@@ -220,7 +220,7 @@ class TestMentatStorage(unittest.TestCase):
         """
         Perform the basic Mentat system tests.
         """
-        self.maxDiff = None  # pylint: disable=locally-disabled,invalid-name
+        self.maxDiff = None
 
         modules = mentat.system.make_module_list([
             { "exec": "mentat-storage.py",   "args": [] },