diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99ecaabfb..3b3700299 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,9 +35,24 @@ jobs:
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.head_ref }}" =~ ^release_ ]]; then \
           echo "matrix={ \
             \"os\": [ \"ubuntu-latest\", \"macos-latest\" ], \
-            \"python-version\": [ \"3.6\", \"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.11\", \"3.12\" ], \
+            \"python-version\": [ \"3.5\", \"3.6\", \"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.11\", \"3.12\" ], \
             \"package_level\": [ \"minimum\", \"latest\", \"ansible\" ], \
             \"exclude\": [ \
+              { \
+                \"os\": \"ubuntu-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"minimum\" \
+              }, \
+              { \
+                \"os\": \"ubuntu-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"latest\" \
+              }, \
+              { \
+                \"os\": \"ubuntu-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"ansible\" \
+              }, \
               { \
                 \"os\": \"ubuntu-latest\", \
                 \"python-version\": \"3.6\", \
@@ -53,6 +68,21 @@ jobs:
                 \"python-version\": \"3.6\", \
                 \"package_level\": \"ansible\" \
               }, \
+              { \
+                \"os\": \"macos-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"minimum\" \
+              }, \
+              { \
+                \"os\": \"macos-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"latest\" \
+              }, \
+              { \
+                \"os\": \"macos-latest\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"ansible\" \
+              }, \
               { \
                 \"os\": \"macos-latest\", \
                 \"python-version\": \"3.6\", \
@@ -103,6 +133,21 @@ jobs:
                 \"package_level\": \"ansible\", \
                 \"container\": {\"image\": \"python:2.7.18-buster\"} \
               }, \
+              { \
+                \"os\": \"ubuntu-20.04\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"minimum\" \
+              }, \
+              { \
+                \"os\": \"ubuntu-20.04\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"latest\" \
+              }, \
+              { \
+                \"os\": \"ubuntu-20.04\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"ansible\" \
+              }, \
               { \
                 \"os\": \"ubuntu-20.04\", \
                 \"python-version\": \"3.6\", \
@@ -118,6 +163,21 @@ jobs:
                 \"python-version\": \"3.6\", \
                 \"package_level\": \"ansible\" \
               }, \
+              { \
+                \"os\": \"macos-12\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"minimum\" \
+              }, \
+              { \
+                \"os\": \"macos-12\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"latest\" \
+              }, \
+              { \
+                \"os\": \"macos-12\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"ansible\" \
+              }, \
               { \
                 \"os\": \"macos-12\", \
                 \"python-version\": \"3.6\", \
@@ -168,6 +228,16 @@ jobs:
                 \"package_level\": \"latest\", \
                 \"container\": {\"image\": \"python:2.7.18-buster\"} \
               }, \
+              { \
+                \"os\": \"ubuntu-20.04\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"minimum\" \
+              }, \
+              { \
+                \"os\": \"ubuntu-20.04\", \
+                \"python-version\": \"3.5\", \
+                \"package_level\": \"latest\" \
+              }, \
               { \
                 \"os\": \"ubuntu-20.04\", \
                 \"python-version\": \"3.6\", \
@@ -205,7 +275,7 @@ jobs:
               }, \
               { \
                 \"os\": \"macos-12\", \
-                \"python-version\": \"3.6\", \
+                \"python-version\": \"3.5\", \
                 \"package_level\": \"latest\" \
               }, \
               { \
@@ -251,8 +321,16 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
-      if: ${{ ! ( matrix.python-version == '2.7' ) }}
+    - name: Set up Python ${{ matrix.python-version }} (if py==3.5)
+      if: ${{ matrix.python-version == '3.5' }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+      env:
+        # Workaround for cert issue on Python 3.5, see https://github.com/actions/setup-python/issues/866
+        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
+    - name: Set up Python ${{ matrix.python-version }} (if py>=3.6)
+      if: ${{ matrix.python-version != '2.7' && matrix.python-version != '3.5' }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index e30fc021c..356ebdeee 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -274,8 +274,7 @@ Operating systems:
 
 Python versions:
 
-- Python 2.7 to Python 3.8 are supported on a best-can-do basis. The collection
-  is no longer tested on Python 3.5.
+- Python 2.7 to Python 3.8 are supported on a best-can-do basis
 - Python 3.9 and higher are officially supported (depends on the Ansible version used)
 
 Ansible versions:
diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
index 08d39ed71..897f1f2d0 100644
--- a/docs/source/release_notes.rst
+++ b/docs/source/release_notes.rst
@@ -33,10 +33,6 @@ Availability: `AutomationHub`_, `Galaxy`_, `GitHub`_
 
 **Deprecations:**
 
-* This collection is no longer tested on Python 3.5, and its use on Python 3.5
-  is at your own risk. The reason is that the setup of Python 3.5 on Github
-  Actions currently fails.
-
 **Bug fixes:**
 
 * Fixed safety issues up to 2024-05-14.
@@ -56,6 +52,9 @@ Availability: `AutomationHub`_, `Galaxy`_, `GitHub`_
   macos-latest back to macos-12 because macos-latest got upgraded from macOS 12
   to macOS 14 which no longer supports these Python versions.
 
+* In the Github Actions test workflow for Python 3.5, added a circumvention
+  for the Pip certificate issue.
+
 **Enhancements:**
 
 * Added a new make target 'end2end_show' to show the HMCs defined for end2end