diff --git a/bolt-connection/src/connection-provider/connection-provider-routing.js b/bolt-connection/src/connection-provider/connection-provider-routing.js
index c5458da8d..b1084c27f 100644
--- a/bolt-connection/src/connection-provider/connection-provider-routing.js
+++ b/bolt-connection/src/connection-provider/connection-provider-routing.js
@@ -174,12 +174,11 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
     for (let i = 0; i < addresses.length; i++) {
       try {
         const connection = await createChannelConnection(
-          this._address,
+          addresses[i],
           this._config,
           this._createConnectionErrorHandler(),
           this._log
         )
-
         const protocolVersion = connection.protocol()
           ? connection.protocol().version
           : null
@@ -194,8 +193,6 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
       } catch (error) {
         lastError = error
       }
-
-      return false
     }
 
     if (lastError) {
diff --git a/bolt-connection/src/connection/connection-channel.js b/bolt-connection/src/connection/connection-channel.js
index bdcde7d58..2c026e535 100644
--- a/bolt-connection/src/connection/connection-channel.js
+++ b/bolt-connection/src/connection/connection-channel.js
@@ -188,7 +188,7 @@ export default class ChannelConnection extends Connection {
           if (metadata) {
             // read server version from the response metadata, if it is available
             const serverVersion = metadata.server
-            if (!this.version) {
+            if (!this.version || serverVersion) {
               this.version = serverVersion
             }
 
diff --git a/test/internal/node/routing.driver.boltkit.test.js b/test/internal/node/routing.driver.boltkit.test.js
index 49c87eb07..907758d13 100644
--- a/test/internal/node/routing.driver.boltkit.test.js
+++ b/test/internal/node/routing.driver.boltkit.test.js
@@ -617,7 +617,7 @@ describe('#stub-routing routing driver with stub server', () => {
 
   function getRoutingTable (driver, database) {
     const connectionProvider = driver._getOrCreateConnectionProvider()
-    return connectionProvider._routingTables[database || '']
+    return connectionProvider._routingTableRegistry.get(database || '', {})
   }
 
   function numberOfOpenConnections (driver) {
diff --git a/test/resources/boltstub/v3/acquire_endpoints.script b/test/resources/boltstub/v3/acquire_endpoints.script
index 6853efaf5..669c8d718 100644
--- a/test/resources/boltstub/v3/acquire_endpoints.script
+++ b/test/resources/boltstub/v3/acquire_endpoints.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_and_exit.script b/test/resources/boltstub/v3/acquire_endpoints_and_exit.script
index 399938f90..de1a1dc47 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_and_exit.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_and_exit.script
@@ -2,7 +2,7 @@
 !: AUTO HELLO
 !: AUTO RESET
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_dead.script b/test/resources/boltstub/v3/acquire_endpoints_dead.script
index ac8ce484b..67e7bab5a 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_dead.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_dead.script
@@ -2,6 +2,6 @@
 !: AUTO HELLO
 !: AUTO RESET
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: <EXIT>
diff --git a/test/resources/boltstub/v3/acquire_endpoints_multiple_records.script b/test/resources/boltstub/v3/acquire_endpoints_multiple_records.script
index 24158655e..f4a5512d4 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_multiple_records.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_multiple_records.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_readers.script b/test/resources/boltstub/v3/acquire_endpoints_no_readers.script
index e5ae9f750..da18f8d29 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_readers.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_readers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_records.script b/test/resources/boltstub/v3/acquire_endpoints_no_records.script
index bc5d5ee53..5a559d506 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_records.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_records.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    SUCCESS {}
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_routers.script b/test/resources/boltstub/v3/acquire_endpoints_no_routers.script
index 32160a258..59d18f4bf 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_routers.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_routers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"},{"addresses": ["127.0.0.1:9001"], "role": "READ"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_servers.script b/test/resources/boltstub/v3/acquire_endpoints_no_servers.script
index 5dd042d32..092c4fbac 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_servers.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_servers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, []]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_servers_field.script b/test/resources/boltstub/v3/acquire_endpoints_no_servers_field.script
index e6b7e1756..f6a5aefce 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_servers_field.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_servers_field.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["notTtl", "noServers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_ttl_field.script b/test/resources/boltstub/v3/acquire_endpoints_no_ttl_field.script
index 3b659cf3c..7523e6ff2 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_ttl_field.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_ttl_field.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["notTtl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_no_writers.script b/test/resources/boltstub/v3/acquire_endpoints_no_writers.script
index 43124515b..db24357d3 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_no_writers.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_no_writers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": [],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_not_supported.script b/test/resources/boltstub/v3/acquire_endpoints_not_supported.script
index cc2abca39..d039f966b 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_not_supported.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_not_supported.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
 C: PULL_ALL
 S: FAILURE {"code": "Neo.ClientError.Procedure.ProcedureNotFound", "message": "blabla"}
 S: IGNORED
diff --git a/test/resources/boltstub/v3/acquire_endpoints_one_router.script b/test/resources/boltstub/v3/acquire_endpoints_one_router.script
index 8d542b7ef..2b2bb1f7b 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_one_router.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_one_router.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9003","127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9005"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_rediscover.script b/test/resources/boltstub/v3/acquire_endpoints_rediscover.script
index b658e2582..ee4882f6d 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_rediscover.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_rediscover.script
@@ -3,12 +3,12 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"], "role": "ROUTE"}]]
    SUCCESS {}
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9004"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005"], "role": "READ"},{"addresses": ["127.0.0.1:9002","127.0.0.1:9003","127.0.0.1:9004"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_self_as_reader.script b/test/resources/boltstub/v3/acquire_endpoints_self_as_reader.script
index d12b30803..4f296eb91 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_self_as_reader.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_self_as_reader.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001","127.0.0.1:9009","127.0.0.1:9010"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9011"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_short_ttl.script b/test/resources/boltstub/v3/acquire_endpoints_short_ttl.script
index 1d5549a1f..7a97e0851 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_short_ttl.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_short_ttl.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [0, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9004"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_template.script b/test/resources/boltstub/v3/acquire_endpoints_template.script
index d2f826df3..495e9d76e 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_template.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_template.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": {{{writers}}},"role": "WRITE"}, {"addresses": {{{readers}}}, "role": "READ"},{"addresses": {{{routers}}}, "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_1.script b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_1.script
index 51d84e839..338923e94 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_1.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_1.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9002"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_2.script b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_2.script
index f03cdc395..a79a0626f 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_2.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_2.script
@@ -2,7 +2,7 @@
 !: AUTO HELLO
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9010"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9011"], "role": "READ"},{"addresses": ["127.0.0.1:9004"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_3.script b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_3.script
index d4fc88590..6080fd6d2 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_3.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_three_servers_set_3.script
@@ -2,7 +2,7 @@
 !: AUTO HELLO
 !: AUTO RESET
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9009"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_two_servers_set_1.script b/test/resources/boltstub/v3/acquire_endpoints_two_servers_set_1.script
index 040f9f992..0f185af95 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_two_servers_set_1.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_two_servers_set_1.script
@@ -1,7 +1,7 @@
 !: BOLT 3
 !: AUTO HELLO
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_unparsable_servers.script b/test/resources/boltstub/v3/acquire_endpoints_unparsable_servers.script
index 4d0cd0b12..be59ba7de 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_unparsable_servers.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_unparsable_servers.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"notAddresses": ["127.0.0.1:9001"],"memberRole": "WRITER"}, {"notAddresses": ["127.0.0.1:9002","127.0.0.1:9003"], "memberRole": "READER"},{"notAddresses": ["127.0.0.1:9001","127.0.0.1:9002"], "memberRole": "ROUTER"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_unparsable_ttl.script b/test/resources/boltstub/v3/acquire_endpoints_unparsable_ttl.script
index 16a5f94da..05faf134d 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_unparsable_ttl.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_unparsable_ttl.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [{ttl: 9223372036854775807}, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_with_context.script b/test/resources/boltstub/v3/acquire_endpoints_with_context.script
index be9ee307b..d9b58a345 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_with_context.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_with_context.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"policy": "my_policy", "region": "china"}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"policy": "my_policy", "region": "china", "address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "READ"},{"addresses": ["127.0.0.1:9001", "127.0.0.1:9002"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/acquire_endpoints_zero_ttl.script b/test/resources/boltstub/v3/acquire_endpoints_zero_ttl.script
index 4d780cd5c..f196970e1 100644
--- a/test/resources/boltstub/v3/acquire_endpoints_zero_ttl.script
+++ b/test/resources/boltstub/v3/acquire_endpoints_zero_ttl.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [0, [{"addresses": ["127.0.0.1:9091","127.0.0.1:9092","127.0.0.1:9093","127.0.0.1:9999"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9999"], "role": "READ"},{"addresses": ["127.0.0.1:9999"], "role": "WRITE"}]]
@@ -12,7 +12,7 @@ C: RUN "MATCH (n) RETURN n" {} {}
    PULL_ALL
 S: SUCCESS {"fields": ["n"]}
    SUCCESS {}
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [0, [{"addresses": ["127.0.0.1:9999"],"role": "ROUTE"}, {"addresses": ["127.0.0.1:9999"], "role": "READ"},{"addresses": ["127.0.0.1:9999"], "role": "WRITE"}]]
diff --git a/test/resources/boltstub/v3/discover_ipv6_servers_and_read.script b/test/resources/boltstub/v3/discover_ipv6_servers_and_read.script
index 4163aa231..2e4aa271f 100644
--- a/test/resources/boltstub/v3/discover_ipv6_servers_and_read.script
+++ b/test/resources/boltstub/v3/discover_ipv6_servers_and_read.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001", "[::1]:9001"],"role": "READ"}, {"addresses": ["[2001:db8:a0b:12f0::1]:9002","[3731:54:65fe:2::a7]:9003"], "role": "WRITE"},{"addresses": ["[ff02::1]:9001","[684D:1111:222:3333:4444:5555:6:77]:9002","[::1]:9003"], "role": "ROUTE"}]]
diff --git a/test/resources/boltstub/v3/discover_servers_and_read.script b/test/resources/boltstub/v3/discover_servers_and_read.script
index ccb6e5ab1..b91947c45 100644
--- a/test/resources/boltstub/v3/discover_servers_and_read.script
+++ b/test/resources/boltstub/v3/discover_servers_and_read.script
@@ -3,7 +3,7 @@
 !: AUTO RESET
 !: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {"address": "127.0.0.1:9001"}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9001"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9002","127.0.0.1:9003"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]