diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py
index 02ef1e0f4..860cdff17 100644
--- a/SoftLayer/CLI/core.py
+++ b/SoftLayer/CLI/core.py
@@ -21,7 +21,7 @@
 from SoftLayer import consts
 
 # pylint: disable=too-many-public-methods, broad-except, unused-argument
-# pylint: disable=redefined-builtin, super-init-not-called
+# pylint: disable=redefined-builtin, super-init-not-called, arguments-differ
 
 START_TIME = time.time()
 DEBUG_LOGGING_MAP = {
diff --git a/SoftLayer/CLI/dns/record_list.py b/SoftLayer/CLI/dns/record_list.py
index bea709819..4e46cb80c 100644
--- a/SoftLayer/CLI/dns/record_list.py
+++ b/SoftLayer/CLI/dns/record_list.py
@@ -7,7 +7,7 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
-# pylint: disable=redefined-builtin
+# pylint: disable=redefined-builtin, redefined-argument-from-local
 
 
 @click.command()
@@ -37,13 +37,13 @@ def cli(env, zone, data, record, ttl, type):
                                   ttl=ttl,
                                   data=data)
 
-    for record in records:
+    for the_record in records:
         table.add_row([
-            record['id'],
-            record['host'],
-            record['type'].upper(),
-            record['ttl'],
-            record['data']
+            the_record['id'],
+            the_record['host'],
+            the_record['type'].upper(),
+            the_record['ttl'],
+            the_record['data']
         ])
 
     env.fout(table)
diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
index 2af718207..bb3d72d12 100644
--- a/SoftLayer/CLI/formatting.py
+++ b/SoftLayer/CLI/formatting.py
@@ -6,7 +6,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=E0202
+# pylint: disable=E0202, consider-merging-isinstance, arguments-differ
 import collections
 import json
 import os
diff --git a/SoftLayer/CLI/template.py b/SoftLayer/CLI/template.py
index e27476c5d..4b03fce3f 100644
--- a/SoftLayer/CLI/template.py
+++ b/SoftLayer/CLI/template.py
@@ -7,6 +7,8 @@
 
     :license: MIT, see LICENSE for more details.
 """
+
+# pylint: disable=redefined-argument-from-local
 import os.path
 
 from SoftLayer import utils
diff --git a/SoftLayer/testing/xmlrpc.py b/SoftLayer/testing/xmlrpc.py
index b4b810670..257a6be75 100644
--- a/SoftLayer/testing/xmlrpc.py
+++ b/SoftLayer/testing/xmlrpc.py
@@ -14,7 +14,7 @@
 from SoftLayer import transports
 from SoftLayer import utils
 
-# pylint: disable=invalid-name, broad-except
+# pylint: disable=invalid-name, broad-except, arguments-differ
 
 
 class TestServer(six.moves.BaseHTTPServer.HTTPServer):
diff --git a/tox.ini b/tox.ini
index c11a205ad..8262ba830 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ basepython = python2.7
 deps =
     -r{toxinidir}/tools/test-requirements.txt
     hacking
-    pylint==1.6.5
+    pylint
 commands =
     flake8 SoftLayer tests
 
@@ -33,6 +33,8 @@ commands =
            -d star-args \
            -d redefined-variable-type \
            -d locally-disabled \
+           -d no-else-return \ 
+           -d len-as-condition \
            --max-args=20 \
            --max-branches=20 \
            --max-statements=60 \