diff --git a/setup.py b/setup.py
index da29c00d0..e7eb01f09 100644
--- a/setup.py
+++ b/setup.py
@@ -67,6 +67,8 @@
         'jinja2',
         'knack',
         'mock',
+        'pylint==2.3.0',
+        'astroid==2.4.2',   # pylint 2.3 doesn't support astroid 2.5
         'pytest>=5.0.0',
         'pytest-xdist', # depends on pytest-forked
         'pyyaml',
@@ -77,10 +79,6 @@
         'azure-multiapi-storage',
         'isort==4.3.21'
     ],
-    extras_require={
-        ":python_version<'3.0'": ['pylint==1.9.2', 'futures'],
-        ":python_version>='3.0'": ['pylint==2.3.0']
-    },
     package_data={
         'azdev.config': ['*.*', 'cli_pylintrc', 'ext_pylintrc'],
         'azdev.mod_templates': ['*.*'],