diff --git a/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java b/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
index 39844c8582f6c..2532659851fe3 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/discovery/DiscoveryService.java
@@ -56,9 +56,9 @@ public Response getDiscoveryDocument() throws URISyntaxException
     {
         String managementUri = configuration.get( ServerSettings.management_api_path ).getPath() + "/";
         String dataUri = configuration.get( ServerSettings.rest_api_path ).getPath() + "/";
-        String boltUri = "bolt://" + configuration.get( GraphDatabaseSettings.bolt_advertised_address );
+        String boltAddress = configuration.get( GraphDatabaseSettings.bolt_advertised_address ).toString();
 
-        return outputFormat.ok( new DiscoveryRepresentation( managementUri, dataUri, boltUri ) );
+        return outputFormat.ok( new DiscoveryRepresentation( managementUri, dataUri, boltAddress ) );
     }
 
     @GET
diff --git a/community/server/src/main/java/org/neo4j/server/rest/repr/DiscoveryRepresentation.java b/community/server/src/main/java/org/neo4j/server/rest/repr/DiscoveryRepresentation.java
index 78e99d377f753..008fa4056a6b6 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/repr/DiscoveryRepresentation.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/repr/DiscoveryRepresentation.java
@@ -28,14 +28,14 @@ public class DiscoveryRepresentation extends MappingRepresentation
     private static final String DISCOVERY_REPRESENTATION_TYPE = "discovery";
     private final String managementUri;
     private final String dataUri;
-    private final String boltUri;
+    private final String boltAddress;
 
-    public DiscoveryRepresentation( String managementUri, String dataUri, String boltUri )
+    public DiscoveryRepresentation( String managementUri, String dataUri, String boltAddress )
     {
         super( DISCOVERY_REPRESENTATION_TYPE );
         this.managementUri = managementUri;
         this.dataUri = dataUri;
-        this.boltUri = boltUri;
+        this.boltAddress = boltAddress;
     }
 
     @Override
@@ -43,7 +43,7 @@ protected void serialize( MappingSerializer serializer )
     {
         serializer.putRelativeUri( MANAGEMENT_URI_KEY, managementUri );
         serializer.putRelativeUri( DATA_URI_KEY, dataUri );
-        serializer.putAbsoluteUri( BOLT_URI_KEY, boltUri );
+        serializer.putAbsoluteUri( BOLT_URI_KEY, "bolt://" + boltAddress );
     }
 
 }
diff --git a/community/server/src/test/java/org/neo4j/server/rest/ConfigureBaseUriDocIT.java b/community/server/src/test/java/org/neo4j/server/rest/ConfigureBaseUriDocIT.java
index bd936954e9db5..68c6968bd4876 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/ConfigureBaseUriDocIT.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/ConfigureBaseUriDocIT.java
@@ -67,7 +67,7 @@ public void shouldForwardHttpAndHost() throws Exception
             String responseEntityBody = new String( data );
 
             assertTrue( responseEntityBody.contains( "http://foobar.com" ) );
-            assertFalse( responseEntityBody.contains( "localhost" ) );
+            assertFalse( responseEntityBody.contains( "http://localhost" ) );
         }
         finally
         {
@@ -99,7 +99,7 @@ public void shouldForwardHttpsAndHost() throws Exception
             String responseEntityBody = new String( data );
 
             assertTrue( responseEntityBody.contains( "https://foobar.com" ) );
-            assertFalse( responseEntityBody.contains( "localhost" ) );
+            assertFalse( responseEntityBody.contains( "https://localhost" ) );
         }
         finally
         {
@@ -131,7 +131,7 @@ public void shouldForwardHttpAndHostOnDifferentPort() throws Exception
             String responseEntityBody = new String( data );
 
             assertTrue( responseEntityBody.contains( "http://foobar.com:9999" ) );
-            assertFalse( responseEntityBody.contains( "localhost" ) );
+            assertFalse( responseEntityBody.contains( "http://localhost" ) );
         }
         finally
         {
@@ -162,7 +162,7 @@ public void shouldForwardHttpAndFirstHost() throws Exception
             String responseEntityBody = new String( data );
 
             assertTrue( responseEntityBody.contains( "http://foobar.com" ) );
-            assertFalse( responseEntityBody.contains( "localhost" ) );
+            assertFalse( responseEntityBody.contains( "http://localhost" ) );
         }
         finally
         {
@@ -194,7 +194,7 @@ public void shouldForwardHttpsAndHostOnDifferentPort() throws Exception
             String responseEntityBody = new String( data );
 
             assertTrue( responseEntityBody.contains( "https://foobar.com:9999" ) );
-            assertFalse( responseEntityBody.contains( "localhost" ) );
+            assertFalse( responseEntityBody.contains( "https://localhost" ) );
         }
         finally
         {
@@ -224,7 +224,7 @@ public void shouldUseRequestUriWhenNoXForwardHeadersPresent() throws Exception
 
             assertFalse( responseEntityBody.contains( "https://foobar.com" ) );
             assertFalse( responseEntityBody.contains( ":0" ) );
-            assertTrue( responseEntityBody.contains( "localhost" ) );
+            assertTrue( responseEntityBody.contains( "http://localhost" ) );
         }
         finally
         {
diff --git a/community/server/src/test/java/org/neo4j/server/rest/repr/DiscoveryRepresentationTest.java b/community/server/src/test/java/org/neo4j/server/rest/repr/DiscoveryRepresentationTest.java
index bc56ed0f27307..7d7d7fafbca11 100644
--- a/community/server/src/test/java/org/neo4j/server/rest/repr/DiscoveryRepresentationTest.java
+++ b/community/server/src/test/java/org/neo4j/server/rest/repr/DiscoveryRepresentationTest.java
@@ -34,8 +34,9 @@ public void shouldCreateAMapContainingDataAndManagementURIs() throws Exception
     {
         String managementUri = "/management";
         String dataUri = "/data";
-        String boltUri = "bolt://localhost:7687";
-        DiscoveryRepresentation dr = new DiscoveryRepresentation( managementUri, dataUri, boltUri );
+        String boltAddress = "localhost:7687";
+        String boltUri = "bolt://" + boltAddress;
+        DiscoveryRepresentation dr = new DiscoveryRepresentation( managementUri, dataUri, boltAddress );
 
         Map<String, Object> mapOfUris = RepresentationTestAccess.serialize( dr );