diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh
index 46c3119545..aa25d157da 100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@ -58,6 +58,9 @@ fi
 set -e # enable immediate exit if venv setup fails
 virtualenv --python=python2 venv
 source venv/bin/activate
+# install pip for python2 like this, if it is not already installed
+# curl -sS https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
+pip install 'pip<21' 'setuptools<45' 'wheel<0.35' 'pbr<6'
 pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
 pip freeze
 
diff --git a/pylib/requirements.txt b/pylib/requirements.txt
index d3ca29f34d..ef1ae177ff 100644
--- a/pylib/requirements.txt
+++ b/pylib/requirements.txt
@@ -20,9 +20,9 @@
 # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
 futures
 six
--e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
+-e git+https://github.com/apache/cassandra-python-driver.git@3.25.0#egg=cassandra-driver
 # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
--e git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm
+-e git+https://github.com/apache/cassandra-ccm.git@cassandra-test#egg=ccm
 cql
 decorator
 docopt