diff --git a/.github/workflows/s3tests.yml b/.github/workflows/s3tests.yml
index 6da1afd30..34611670b 100644
--- a/.github/workflows/s3tests.yml
+++ b/.github/workflows/s3tests.yml
@@ -37,6 +37,8 @@ jobs:
         run: |
           git clone https://github.com/ceph/s3-tests.git
           cd s3-tests
+          # Pin to a specific commit before the directory structure changed
+          git checkout 8ca5fe9a3c62d42cd9c96b3f6b99a37d14662379 || git checkout main
           pip install -r requirements.txt
           pip install tox
           pip install -e .
@@ -336,6 +338,8 @@ jobs:
         run: |
           git clone https://github.com/ceph/s3-tests.git
           cd s3-tests
+          # Pin to a specific commit before the directory structure changed
+          git checkout 8ca5fe9a3c62d42cd9c96b3f6b99a37d14662379 || git checkout main
           pip install -r requirements.txt
           pip install tox
           pip install -e .
@@ -504,6 +508,8 @@ jobs:
         run: |
           git clone https://github.com/ceph/s3-tests.git
           cd s3-tests
+          # Pin to a specific commit before the directory structure changed
+          git checkout 8ca5fe9a3c62d42cd9c96b3f6b99a37d14662379 || git checkout main
           pip install -r requirements.txt
           pip install tox
           pip install -e .
@@ -727,6 +733,8 @@ jobs:
         run: |
           git clone https://github.com/ceph/s3-tests.git
           cd s3-tests
+          # Pin to a specific commit before the directory structure changed
+          git checkout 8ca5fe9a3c62d42cd9c96b3f6b99a37d14662379 || git checkout main
           pip install -r requirements.txt
           pip install tox
           pip install -e .