diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java
index 3a99326542..7f1c55906b 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java
@@ -192,7 +192,7 @@ void shouldFailWhenServerIsRestarted()
 
                 if ( i == 0 )
                 {
-                    neo4j.killDb();
+                    neo4j.stopDb();
                 }
 
                 List<Record> records = await( cursor.listAsync() );
@@ -583,7 +583,7 @@ void shouldConsumeNonEmptyCursor()
     @Test
     void shouldRunAfterRunFailureToAcquireConnection()
     {
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () ->
         {
@@ -633,7 +633,7 @@ void shouldNotRunAfterBeginTxFailureOnBookmark()
     @Test
     void shouldBeginTxAfterRunFailureToAcquireConnection()
     {
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () ->
         {
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java
index 7b84c4450b..5e566e11ef 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java
@@ -575,7 +575,7 @@ void shouldFailToCommitWhenServerIsRestarted()
 
         await( tx.runAsync( "CREATE ()" ) );
 
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () -> await( tx.commitAsync() ) );
     }
diff --git a/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java
index 0ee04ce134..1e4af022b6 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java
@@ -99,14 +99,12 @@ void setUp()
         System.setProperty( DRIVER_METRICS_ENABLED_KEY, "true" );
         logging = new LoggerNameTrackingLogging();
 
-        Config config = Config.builder()
-                .withoutEncryption()
+        Config.ConfigBuilder builder = Config.builder()
                 .withLogging( logging )
                 .withMaxConnectionPoolSize( 100 )
-                .withConnectionAcquisitionTimeout( 1, MINUTES )
-                .build();
+                .withConnectionAcquisitionTimeout( 1, MINUTES );
 
-        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config );
+        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( builder ) );
         System.setProperty( DRIVER_METRICS_ENABLED_KEY, "false" );
 
         ThreadFactory threadFactory = new DaemonThreadFactory( getClass().getSimpleName() + "-worker-" );
@@ -186,6 +184,8 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
 
     abstract AuthToken authToken();
 
+    abstract Config config( Config.ConfigBuilder builder );
+
     abstract C createContext();
 
     abstract List<BlockingCommand<C>> createTestSpecificBlockingCommands();
diff --git a/driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java b/driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java
index 71013a4f23..3b6da2c680 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java
@@ -35,6 +35,7 @@
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.internal.util.ServerVersion;
 import org.neo4j.driver.v1.AuthToken;
+import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.exceptions.SessionExpiredException;
 import org.neo4j.driver.v1.summary.ResultSummary;
@@ -66,6 +67,12 @@ AuthToken authToken()
         return clusterRule.getAuthToken();
     }
 
+    @Override
+    Config config( Config.ConfigBuilder builder )
+    {
+        return clusterRule.getDriverConfig( builder );
+    }
+
     @Override
     Context createContext()
     {
diff --git a/driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java b/driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java
index 5448dd85d3..708fd83404 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.neo4j.driver.v1.AuthToken;
+import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.util.DatabaseExtension;
 import org.neo4j.driver.v1.util.ParallelizableIT;
@@ -52,6 +53,12 @@ AuthToken authToken()
         return neo4j.authToken();
     }
 
+    @Override
+    Config config( Config.ConfigBuilder builder )
+    {
+        return builder.build();
+    }
+
     @Override
     Context createContext()
     {
diff --git a/driver/src/test/java/org/neo4j/driver/v1/util/DatabaseExtension.java b/driver/src/test/java/org/neo4j/driver/v1/util/DatabaseExtension.java
index 6c1cc9fed0..77792e824e 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/util/DatabaseExtension.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/util/DatabaseExtension.java
@@ -163,11 +163,6 @@ public void stopDb()
         runner.stopNeo4j();
     }
 
-    public void killDb()
-    {
-        runner.killNeo4j();
-    }
-
     public ServerVersion version()
     {
         return ServerVersion.version( driver() );
diff --git a/driver/src/test/java/org/neo4j/driver/v1/util/cc/LocalOrRemoteClusterExtension.java b/driver/src/test/java/org/neo4j/driver/v1/util/cc/LocalOrRemoteClusterExtension.java
index 2248fcfe3f..4356a5625b 100644
--- a/driver/src/test/java/org/neo4j/driver/v1/util/cc/LocalOrRemoteClusterExtension.java
+++ b/driver/src/test/java/org/neo4j/driver/v1/util/cc/LocalOrRemoteClusterExtension.java
@@ -28,6 +28,7 @@
 import org.neo4j.driver.internal.util.DriverFactoryWithOneEventLoopThread;
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
+import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.util.TestUtil;
 
@@ -62,6 +63,20 @@ public AuthToken getAuthToken()
         return localClusterExtension.getDefaultAuthToken();
     }
 
+    public Config getDriverConfig( Config.ConfigBuilder builder )
+    {
+        if ( remoteClusterExists() )
+        {
+            builder.withEncryption();
+        }
+        else
+        {
+            builder.withoutEncryption();
+        }
+
+        return builder.build();
+    }
+
     @Override
     public void beforeAll( ExtensionContext context ) throws Exception
     {