diff --git a/tests/session/session-003.phpt b/tests/session/session-003.phpt
index f832fce43..12033fd78 100644
--- a/tests/session/session-003.phpt
+++ b/tests/session/session-003.phpt
@@ -4,7 +4,6 @@ MongoDB\Driver\Session spec test: session cannot be used for different clients
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_live(); ?>
-<?php skip_if_not_clean(); ?>
 <?php skip_if_server_version('<', '3.6'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-endSession-001.phpt b/tests/session/session-endSession-001.phpt
index 3471d576d..1ee68c8da 100644
--- a/tests/session/session-endSession-001.phpt
+++ b/tests/session/session-endSession-001.phpt
@@ -2,6 +2,7 @@
 MongoDB\Driver\Session::endSession() Calling methods after session has been ended
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
diff --git a/tests/session/session-startTransaction-001.phpt b/tests/session/session-startTransaction-001.phpt
index f63057ba7..b4432b860 100644
--- a/tests/session/session-startTransaction-001.phpt
+++ b/tests/session/session-startTransaction-001.phpt
@@ -3,6 +3,7 @@ MongoDB\Driver\Session::startTransaction() ensure that methods can be called
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_libmongoc_crypto() ?>
+<?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-001.phpt b/tests/session/session-startTransaction_error-001.phpt
index 048a22228..6e546aefa 100644
--- a/tests/session/session-startTransaction_error-001.phpt
+++ b/tests/session/session-startTransaction_error-001.phpt
@@ -2,6 +2,8 @@
 MongoDB\Driver\Session::startTransaction() twice
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto() ?>
+<?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-002.phpt b/tests/session/session-startTransaction_error-002.phpt
index d3da50b13..142855ae8 100644
--- a/tests/session/session-startTransaction_error-002.phpt
+++ b/tests/session/session-startTransaction_error-002.phpt
@@ -2,6 +2,8 @@
 MongoDB\Driver\Session::startTransaction() with wrong values in options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto() ?>
+<?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session-startTransaction_error-003.phpt b/tests/session/session-startTransaction_error-003.phpt
index 523ad4dbd..7a97de875 100644
--- a/tests/session/session-startTransaction_error-003.phpt
+++ b/tests/session/session-startTransaction_error-003.phpt
@@ -2,6 +2,8 @@
 MongoDB\Driver\Session::startTransaction() with wrong argument for options array
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_libmongoc_crypto() ?>
+<?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
 --FILE--
 <?php
diff --git a/tests/session/session_error-001.phpt b/tests/session/session_error-001.phpt
index 3f8a3191c..603210f0f 100644
--- a/tests/session/session_error-001.phpt
+++ b/tests/session/session_error-001.phpt
@@ -1,12 +1,10 @@
 --TEST--
 MongoDB\Driver\Session with wrong defaultTransactionOptions
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(URI);
+$manager = new MongoDB\Driver\Manager();
 
 $options = [
     [ 'readConcern' => 42 ], 
diff --git a/tests/session/transaction-integration-001.phpt b/tests/session/transaction-integration-001.phpt
index 39c250170..a36172777 100644
--- a/tests/session/transaction-integration-001.phpt
+++ b/tests/session/transaction-integration-001.phpt
@@ -2,10 +2,11 @@
 MongoDB\Driver\Session::startTransaction() Committing a transaction with example for how to handle failures
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_employees'); ?>
-<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_events'); ?>
+<?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
+<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_employees'); ?>
+<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_events'); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/session/transaction-integration-002.phpt b/tests/session/transaction-integration-002.phpt
index 3ea2073e1..dfb710cbf 100644
--- a/tests/session/transaction-integration-002.phpt
+++ b/tests/session/transaction-integration-002.phpt
@@ -2,9 +2,10 @@
 MongoDB\Driver\Session::startTransaction() Transient Error Test
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME); ?>
+<?php skip_if_not_libmongoc_crypto(); ?>
 <?php skip_if_not_replica_set(); ?>
 <?php skip_if_server_version('<', '4.0'); ?>
+<?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";