diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
index f6a6b21f99..c70025ff59 100644
--- a/metadata-ingestion/setup.py
+++ b/metadata-ingestion/setup.py
@@ -98,9 +98,27 @@ all_exclude_plugins: Set[str] = {
     "mssql-odbc",
 }
 
+mypy_stubs = {
+    # for Python 3.6 support
+    "dataclasses",
+    "types-dataclasses",
+    "sqlalchemy-stubs",
+    "types-pkg_resources",
+    "types-six",
+    "types-python-dateutil",
+    "types-requests",
+    "types-toml",
+    "types-PyMySQL",
+    "types-PyYAML",
+    "types-freezegun",
+    # versions 0.1.13 and 0.1.14 seem to have issues
+    "types-click==0.1.12",
+}
+
 base_dev_requirements = {
     *base_requirements,
     *framework_common,
+    *mypy_stubs,
     "black>=19.10b0",
     "coverage>=5.1",
     "flake8>=3.8.3",
@@ -110,7 +128,6 @@ base_dev_requirements = {
     "pytest-cov>=2.8.1",
     "pytest-docker",
     "tox",
-    "sqlalchemy-stubs",
     "deepdiff",
     "requests-mock",
     "freezegun",