diff --git a/codebuild/bin/criterion_baseline.sh b/codebuild/bin/criterion_baseline.sh
index 4c93a064223..c7cf4a3cc01 100755
--- a/codebuild/bin/criterion_baseline.sh
+++ b/codebuild/bin/criterion_baseline.sh
@@ -19,7 +19,6 @@ source codebuild/bin/utils.sh
 # Disable PQ
 export S2N_NO_PQ=1
 # Limit the number of child processes in the test run
-export XDIST_WORKERS=2
 export RUST_BACKTRACE=1
 export TOX_TEST_NAME="$INTEGV2_TEST"
 
diff --git a/codebuild/bin/criterion_delta.sh b/codebuild/bin/criterion_delta.sh
index 49bcce14c5e..1089078ca78 100755
--- a/codebuild/bin/criterion_delta.sh
+++ b/codebuild/bin/criterion_delta.sh
@@ -17,7 +17,6 @@ source ./codebuild/bin/utils.sh
 export S2N_NO_PQ=1
 export AWS_S3_BUCKET="s3://s2n-tls-logs/"
 # Limit the number of child processes in the test run
-export XDIST_WORKERS=4
 export RUST_BACKTRACE=1
 
 export GIT_COMMIT=$(git log -n 1 --format="%h")
diff --git a/codebuild/spec/buildspec_ubuntu_integv2criterion.yml b/codebuild/spec/buildspec_ubuntu_integv2criterion.yml
index 0d4c8de2305..0354a0eb55e 100644
--- a/codebuild/spec/buildspec_ubuntu_integv2criterion.yml
+++ b/codebuild/spec/buildspec_ubuntu_integv2criterion.yml
@@ -20,7 +20,6 @@ batch:
           S2N_NO_PQ: 1
           TESTS: integrationv2crit
           GCC_VERSION: 6
-          XDIST_WORKERS: 2
           RUST_BACKTRACE: 1
     - identifier: s2nIntegrationv2WellKnownEndpoints
       debug-session: true
@@ -33,7 +32,6 @@ batch:
           S2N_NO_PQ: 1
           TESTS: integrationv2crit
           GCC_VERSION: 6
-          XDIST_WORKERS: 2
           ARTIFACT_BUCKET: s3://s2n-tls-logs/release
           ARTIFACT_FILE: integv2criterion
       depend-on:
diff --git a/tests/integrationv2/tox.ini b/tests/integrationv2/tox.ini
index afe2e1006a6..7056471a76a 100644
--- a/tests/integrationv2/tox.ini
+++ b/tests/integrationv2/tox.ini
@@ -8,13 +8,21 @@ setenv = S2N_INTEG_TEST = 1
 passenv = DYLD_LIBRARY_PATH, LD_LIBRARY_PATH, OQS_OPENSSL_1_1_1_INSTALL_DIR, HOME, TOX_TEST_NAME
 ignore_errors=False
 deps =
-    pep8
-    pytest==5.3.5
-    pytest-xdist==1.34.0
-    sslyze==5.0.2
+    pytest==7
+    pytest-xdist==3.3
+    sslyze==5
     pytest-rerunfailures
+# -x : exit on first failure
+# -n 2 : run with two worker processes, don't use higher until https://github.com/aws/s2n-tls/issues/2469 is addressed
+# -rpfsq : print a (r)eport with (p)assed tests, (f)ailed tests, and (s)kipped tests
+# --durations=10 : print the 10 slowest tests
 commands =
-    pytest -x -n={env:XDIST_WORKERS:"2"} --maxfail=1 --reruns=2 --cache-clear -rpfsq \
+    pytest -x \
+        -n=2 \
+        --reruns=2 \
+        --cache-clear \
+        -rpfsq \
+        --durations=10 \
         -o log_cli=true --log-cli-level=INFO \
         --provider-version={env:S2N_LIBCRYPTO} \
         --provider-criterion={env:S2N_USE_CRITERION:"off"} \