diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 485cf93b4f5..02c7be96e35 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -45,6 +45,10 @@ jobs:
           pipenv run pip install flake8==3.5.0 pypandoc==1.3.3
           pipenv run pip install importlib_metadata==3.10.0
           pipenv run pip install mypy==0.910
+          pipenv run pip install cryptography==37.0.4
+          pipenv run pip install twine==4.0.1
+          pipenv run pip install wheel==0.33.4
+          pipenv run pip install setuptools==41.0.1
       - name: Run Scala/Java and Python tests
         run: |
           pipenv run python run-tests.py
diff --git a/Dockerfile b/Dockerfile
index bd34ba286c4..e689e723fde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,16 @@ RUN pip install mypy==0.910
 
 RUN pip install importlib_metadata==3.10.0
 
+RUN pip install cryptography==37.0.4
+
+# We must install cryptography before twine. Else, twine will pull a newer version of
+# cryptography that requires a newer version of Rust and may break tests.
+RUN pip install twine==4.0.1
+
+RUN pip install wheel==0.33.4
+
+RUN pip install setuptools==41.0.1
+
 # Do not add any non-deterministic changes (e.g., copy from files 
 # from repo) in this Dockerfile, so that the  docker image 
 # generated from this can be reused across builds.
diff --git a/python/run-tests.py b/python/run-tests.py
index a99e1d4c43b..5797ca99def 100755
--- a/python/run-tests.py
+++ b/python/run-tests.py
@@ -115,13 +115,13 @@ def run_mypy_tests(root_dir):
 
 def run_pypi_packaging_tests(root_dir):
     """
-    We want to test that the PyPi artifact for this delta version can be generated,
+    We want to test that the delta-spark PyPi artifact for this delta version can be generated,
     locally installed, and used in python tests.
 
-    We will uninstall any existing local delta PyPi artifact.
-    We will generate a new local delta PyPi artifact.
+    We will uninstall any existing local delta-spark PyPi artifact.
+    We will generate a new local delta-spark PyPi artifact.
     We will install it into the local PyPi repository.
-    And then we will run relevant python tests to ensure everything works as exepcted.
+    And then we will run relevant python tests to ensure everything works as expected.
     """
     print("##### Running PyPi Packaging tests #####")
 
@@ -130,10 +130,7 @@ def run_pypi_packaging_tests(root_dir):
         version = fd.readline().split('"')[1]
 
     # uninstall packages if they exist
-    run_cmd(["pip3", "uninstall", "--yes", "delta-spark", "pyspark"], stream_output=True)
-
-    # install helper pip packages
-    run_cmd(["pip3", "install", "wheel", "twine", "setuptools", "--upgrade"], stream_output=True)
+    run_cmd(["pip3", "uninstall", "--yes", "delta-spark"], stream_output=True)
 
     wheel_dist_dir = path.join(root_dir, "dist")
 
@@ -152,7 +149,7 @@ def run_pypi_packaging_tests(root_dir):
     version_formatted = version.replace("-", "_")
     delta_whl_name = "delta_spark-" + version_formatted + "-py3-none-any.whl"
 
-    # this will install delta-spark-$version and pyspark
+    # this will install delta-spark-$version
     install_whl_cmd = ["pip3", "install", path.join(wheel_dist_dir, delta_whl_name)]
     run_cmd(install_whl_cmd, stream_output=True)