diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt
index 07dd2b9d04..89679c5e75 100644
--- a/requirements/requirements_dev.txt
+++ b/requirements/requirements_dev.txt
@@ -13,7 +13,7 @@ pytest-django
 pytest-pythonpath
 pytest-mock
 pytest-timeout
-pytest-xdist
+pytest-xdist<1.28.0
 logutils
 jupyter
 matplotlib
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index c27c86679f..061773a9e5 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -19,9 +19,7 @@ RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \
   zanata-python-client gettext gcc-c++ libcurl-devel bzip2 \
   rsync
 
-RUN ln -s /usr/bin/python36 /usr/bin/python3
-
-RUN python36 -m ensurepip
+RUN python3 -m ensurepip
 RUN pip3 install virtualenv
 RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
 RUN mkdir -p /data/db
diff --git a/tools/docker-isolated/Dockerfile b/tools/docker-isolated/Dockerfile
index 3a75462b8c..f99076b671 100644
--- a/tools/docker-isolated/Dockerfile
+++ b/tools/docker-isolated/Dockerfile
@@ -7,8 +7,7 @@ ADD requirements/requirements_ansible.txt requirements/requirements_ansible_git.
 RUN yum -y update && yum -y install curl epel-release
 RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git python-devel python36 python36-devel python-psycopg2 make python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2
 
-RUN ln -s /usr/bin/python36 /usr/bin/python3
-RUN python36 -m ensurepip
+RUN python3 -m ensurepip
 RUN pip3 install virtualenv
 RUN pip3 install ansible-runner
 WORKDIR /tmp