diff --git a/.pylintrc b/.pylintrc
index a1f7b7cb6..44fc15b1c 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -322,11 +322,7 @@ max-attributes=7
 min-public-methods=2
 
 # Maximum number of public methods for a class (see R0904).
-# Pylint counts all of the public methods that you also inherit.
-# This has been reported/fixed as a bug, but until our version is fixed,
-# I think this will only cause us headaches. (Unittests are automatically over)
-# https://bitbucket.org/logilab/pylint/issue/248/too-many-public-methods-triggered-from
-max-public-methods=100
+max-public-methods=20
 
 
 [EXCEPTIONS]
diff --git a/letsencrypt/client/apache/configurator.py b/letsencrypt/client/apache/configurator.py
index b4d07985a..ad6e54273 100644
--- a/letsencrypt/client/apache/configurator.py
+++ b/letsencrypt/client/apache/configurator.py
@@ -43,7 +43,7 @@ from letsencrypt.client.apache import parser
 
 
 class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
-    # pylint: disable=too-many-instance-attributes
+    # pylint: disable=too-many-instance-attributes,too-many-public-methods
     """Apache configurator.
 
     State of Configurator: This code has been tested under Ubuntu 12.04
diff --git a/letsencrypt/client/log.py b/letsencrypt/client/log.py
index 19d33c53a..91319156b 100644
--- a/letsencrypt/client/log.py
+++ b/letsencrypt/client/log.py
@@ -6,7 +6,7 @@ import dialog
 from letsencrypt.client import display
 
 
-class DialogHandler(logging.Handler):
+class DialogHandler(logging.Handler):  # pylint: disable=too-few-public-methods
     """Logging handler using dialog info box.
 
     :ivar int height: Height of the info box (without padding).
diff --git a/letsencrypt/client/tests/acme_test.py b/letsencrypt/client/tests/acme_test.py
index f3cf4a69a..514c6b14e 100644
--- a/letsencrypt/client/tests/acme_test.py
+++ b/letsencrypt/client/tests/acme_test.py
@@ -42,7 +42,7 @@ class ACMEObjectValidateTest(unittest.TestCase):
         self._test_fails('{"type": "foo", "price": "asd"}')
 
 
-class PrettyTest(unittest.TestCase):
+class PrettyTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
     """Tests for letsencrypt.client.acme.pretty."""
 
     @classmethod
diff --git a/letsencrypt/client/tests/apache/util.py b/letsencrypt/client/tests/apache/util.py
index d5a662924..fe27921b7 100644
--- a/letsencrypt/client/tests/apache/util.py
+++ b/letsencrypt/client/tests/apache/util.py
@@ -12,7 +12,7 @@ from letsencrypt.client.apache import configurator
 from letsencrypt.client.apache import obj
 
 
-class ApacheTest(unittest.TestCase):
+class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
 
     def setUp(self):
         super(ApacheTest, self).setUp()
diff --git a/letsencrypt/client/tests/crypto_util_test.py b/letsencrypt/client/tests/crypto_util_test.py
index 96acdbd9b..8b1a8ecd7 100644
--- a/letsencrypt/client/tests/crypto_util_test.py
+++ b/letsencrypt/client/tests/crypto_util_test.py
@@ -95,7 +95,7 @@ class CSRMatchesPubkeyTest(unittest.TestCase):
         self.assertFalse(self._call_testdata('csr.pem', RSA512_KEY))
 
 
-class MakeKeyTest(unittest.TestCase):
+class MakeKeyTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
     """Tests for letsencrypt.client.crypto_util.make_key."""
 
     def test_it(self):  # pylint: disable=no-self-use
@@ -124,6 +124,7 @@ class ValidPrivkeyTest(unittest.TestCase):
 
 
 class MakeSSCertTest(unittest.TestCase):
+    # pylint: disable=too-few-public-methods
     """Tests for letsencrypt.client.crypto_util.make_ss_cert."""
 
     def test_it(self):  # pylint: disable=no-self-use
@@ -170,6 +171,7 @@ class GetCertInfoTest(unittest.TestCase):
 
 
 class B64CertToPEMTest(unittest.TestCase):
+    # pylint: disable=too-few-public-methods
     """Tests for letsencrypt.client.crypto_util.b64_cert_to_pem."""
 
     def test_it(self):
diff --git a/letsencrypt/client/tests/reverter_test.py b/letsencrypt/client/tests/reverter_test.py
index e7766e331..39ef3d135 100644
--- a/letsencrypt/client/tests/reverter_test.py
+++ b/letsencrypt/client/tests/reverter_test.py
@@ -385,6 +385,7 @@ class TestFullCheckpointsReverter(unittest.TestCase):
 
 
 class QuickInitReverterTest(unittest.TestCase):
+    # pylint: disable=too-few-public-methods
     """Quick test of init."""
     def test_init(self):
         from letsencrypt.client.reverter import Reverter
diff --git a/setup.py b/setup.py
index 7033dfd70..004388b5e 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ testing_extras = [
     'coverage',
     'nose',
     'nosexcover',
-    'pylint',
+    'pylint>=1.4.0',  # upstream #248
     'tox',
 ]