diff --git a/.travis.yml b/.travis.yml
index 0b55cda19..6628e8e43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,19 @@ matrix:
       python: 3.7  # Keep in sync with .readthedocs.yml
     - env: TOXENV=typing
       python: 3.8
-
-    - env: TOXENV=pinned
-      python: 3.5.2
-    - env: TOXENV=asyncio-pinned
-      python: 3.5.2  # We use additional code to support 3.5.3 and earlier
-    - env: TOXENV=pypy3-pinned PYPY_VERSION=3-v5.9.0
-
-    - env: TOXENV=py
-      python: 3.5
-    - env: TOXENV=asyncio
-      python: 3.5  # We use specific code to support >= 3.5.4, < 3.6
-    - env: TOXENV=pypy3 PYPY_VERSION=3.5-v7.0.0
+  
+# ToDo: Remove once merged into master
+#    - env: TOXENV=pinned
+#      python: 3.5.2
+#    - env: TOXENV=asyncio-pinned
+#      python: 3.5.2  # We use additional code to support 3.5.3 and earlier
+#    - env: TOXENV=pypy3-pinned PYPY_VERSION=3-v5.9.0
+#
+#    - env: TOXENV=py
+#      python: 3.5
+#    - env: TOXENV=asyncio
+#      python: 3.5  # We use specific code to support >= 3.5.4, < 3.6
+#    - env: TOXENV=pypy3 PYPY_VERSION=3.5-v7.0.0
 
     - env: TOXENV=py
       python: 3.6
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 710e42090..c77c128b3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,9 +4,10 @@ pool:
   vmImage: 'windows-latest'
 strategy:
   matrix:
-    Python35:
-      python.version: '3.5'
-      TOXENV: windows-pinned
+# ToDo: Remove once merged into master
+#    Python35:
+#      python.version: '3.5'
+#      TOXENV: windows-pinned
     Python36:
       python.version: '3.6'
     Python37: