diff --git a/python/requirements-test.txt b/python/requirements-test.txt
index 0d6ca35f..0bc2eeba 100644
--- a/python/requirements-test.txt
+++ b/python/requirements-test.txt
@@ -1,4 +1,4 @@
-pytest-mock
+pytest-mock==3.1.0
 pytest
 pytest-cov
 responses
diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index f1853305..5e674ab5 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -47,10 +47,13 @@
           with_items:
             - docker.io
             - python-pip
+            - python-setuptools
+            - python3-setuptools
           when: ansible_os_family == 'Debian'
         - pip:
             name: docker
             version: 2.7.0
+            executable: pip
       become: True
 
     - name: Make images