diff --git a/sdk/core/azure-core/HISTORY.md b/sdk/core/azure-core/HISTORY.md
index bd4820743083..7aef0dc79e86 100644
--- a/sdk/core/azure-core/HISTORY.md
+++ b/sdk/core/azure-core/HISTORY.md
@@ -6,6 +6,7 @@
 ### Bug fixes
 
 - Fixed a bug that sends None as request_id #9545
+- Enable mypy for customers #9572
 
 ## 1.2.1 (2020-01-14)
 
diff --git a/sdk/core/azure-core/MANIFEST.in b/sdk/core/azure-core/MANIFEST.in
index 396e2ec6f505..007d6a1e69cd 100644
--- a/sdk/core/azure-core/MANIFEST.in
+++ b/sdk/core/azure-core/MANIFEST.in
@@ -3,4 +3,5 @@ include *.md
 include azure/__init__.py
 recursive-include samples *.py *.md
 recursive-include doc *.rst
+include azure/core/py.typed
 
diff --git a/sdk/core/azure-core/azure/core/py.typed b/sdk/core/azure-core/azure/core/py.typed
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sdk/core/azure-core/setup.py b/sdk/core/azure-core/setup.py
index f7640b62ae4f..3426b8db4d38 100644
--- a/sdk/core/azure-core/setup.py
+++ b/sdk/core/azure-core/setup.py
@@ -36,6 +36,7 @@
 setup(
     name=PACKAGE_NAME,
     version=version,
+    include_package_data=True,
     description='Microsoft Azure {} Library for Python'.format(PACKAGE_PPRINT_NAME),
     long_description=readme + '\n\n' + history,
     long_description_content_type='text/markdown',
@@ -61,6 +62,9 @@
         # Exclude packages that will be covered by PEP420 or nspkg
         'azure',
     ]),
+    package_data={
+        'pytyped': ['py.typed'],
+    },
     install_requires=[
         'requests>=2.18.4',
         'six>=1.6',
diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py b/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
index 690469f0b817..da96455c7cf6 100644
--- a/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
+++ b/sdk/eventhub/azure-eventhub/azure/eventhub/_client_base.py
@@ -161,7 +161,8 @@ def _create_auth(self):
         the session.
         """
         try:
-            token_type = self._credential.token_type
+            # ignore mypy's warning because token_type is Optional
+            token_type = self._credential.token_type    # type: ignore
         except AttributeError:
             token_type = b"jwt"
         if token_type == b"servicebus.windows.net:sastoken":
diff --git a/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py b/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
index f5c11614d811..aac3668dadd8 100644
--- a/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
+++ b/sdk/eventhub/azure-eventhub/azure/eventhub/aio/_client_base_async.py
@@ -99,7 +99,8 @@ async def _create_auth_async(self) -> authentication.JWTTokenAsync:
 
         """
         try:
-            token_type = self._credential.token_type
+            # ignore mypy's warning because token_type is Optional
+            token_type = self._credential.token_type    # type: ignore
         except AttributeError:
             token_type = b"jwt"
         if token_type == b"servicebus.windows.net:sastoken":