diff --git a/README.md b/README.md
index dfe77fa9..514e9021 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,14 @@ debugpy.wait_for_client()  # blocks execution until client is attached
 ```
 
 ### `breakpoint()` function
-In Python 3.7 and above, `debugpy` supports the standard `breakpoint()` function. Use `debugpy.breakpoint()` function for similar behavior and compatibility with older versions of Python. If the debugger is attached when either of these functions is invoked, it will pause execution on the calling line, as if it had a breakpoint set. If there's no client attached, the functions do nothing, and the code continues to execute normally.
+Where available, debugpy supports the standard `breakpoint()` function for programmatic breakpoints. Use `debugpy.breakpoint()` function to get the same behavior when `breakpoint()` handler installed by debugpy is overridden by another handler. If the debugger is attached when either of these functions is invoked, it will pause execution on the calling line, as if it had a breakpoint set. If there's no client attached, the functions do nothing, and the code continues to execute normally.
 ```python
 import debugpy
 debugpy.listen(...)
 
 while True:
     ...
-    breakpoint()  # or debugpy.breakpoint() on 3.6 and below
+    breakpoint()  # or debugpy.breakpoint()
     ...
 ```
 
diff --git a/azure-pipelines/pipelines.yaml b/azure-pipelines/pipelines.yaml
index f7efd895..cfe4425f 100644
--- a/azure-pipelines/pipelines.yaml
+++ b/azure-pipelines/pipelines.yaml
@@ -37,8 +37,6 @@ jobs:
 
       strategy:
           matrix:
-              py36:
-                  python.version: "3.6"
               py37:
                   python.version: "3.7"
               py38:
@@ -95,8 +93,6 @@ jobs:
 
       strategy:
           matrix:
-              py36:
-                  python.version: "3.6"
               py37:
                   python.version: "3.7"
               py38:
diff --git a/setup.py b/setup.py
index adce48b5..5fc40070 100644
--- a/setup.py
+++ b/setup.py
@@ -158,13 +158,13 @@ if __name__ == "__main__":
         project_urls={
             "Source": "https://github.com/microsoft/debugpy",
         },
-        python_requires=">=3.6",
+        python_requires=">=3.7",
         classifiers=[
             "Development Status :: 5 - Production/Stable",
-            "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
+            "Programming Language :: Python :: 3.10",
             "Topic :: Software Development :: Debuggers",
             "Operating System :: Microsoft :: Windows",
             "Operating System :: MacOS",
diff --git a/tox.ini b/tox.ini
index 7c6bd798..cd5bdd20 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,39,310}{,-cov}
+envlist = py{37,38,39,310}{,-cov}
 
 [testenv]
 deps = -rtests/requirements.txt