diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java
index 034bcea21b93f..d45e9f6dfb9ab 100644
--- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java
+++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusClient.java
@@ -13,6 +13,7 @@
  */
 package com.facebook.presto.plugin.prometheus;
 
+import com.facebook.airlift.http.client.HttpUriBuilder;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.log.Logger;
 import com.facebook.presto.common.type.DoubleType;
@@ -38,7 +39,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.security.KeyManagementException;
@@ -92,13 +92,8 @@ public PrometheusClient(PrometheusConnectorConfig config, JsonCodec<Map<String,
 
     private static URI getPrometheusMetricsURI(URI prometheusUri)
     {
-        try {
-            // endpoint to retrieve metric names from Prometheus
-            return new URI(prometheusUri.getScheme(), prometheusUri.getAuthority(), prometheusUri.getPath() + METRICS_ENDPOINT, null, null);
-        }
-        catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        // endpoint to retrieve metric names from Prometheus
+        return HttpUriBuilder.uriBuilderFrom(prometheusUri).appendPath(METRICS_ENDPOINT).build();
     }
 
     public Set<String> getTableNames(String schema)
diff --git a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java
index cc3f1cf4bf74d..6833040519629 100644
--- a/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java
+++ b/presto-prometheus/src/main/java/com/facebook/presto/plugin/prometheus/PrometheusSplitManager.java
@@ -160,13 +160,13 @@ static String decimalSecondString(long millis)
         return new BigDecimal(Long.toString(millis)).divide(new BigDecimal(1000L)).toPlainString();
     }
 
-    // URIBuilder handles URI encode
+    // HttpUriBuilder handles URI encode
     private static URI buildQuery(URI baseURI, String time, String metricName, Duration queryChunkSizeDuration)
             throws URISyntaxException
     {
         return HttpUriBuilder
                 .uriBuilderFrom(baseURI)
-                .replacePath("api/v1/query")
+                .appendPath("api/v1/query")
                 .addParameter("query", metricName + "[" + queryChunkSizeDuration.roundTo(queryChunkSizeDuration.getUnit()) +
                         Duration.timeUnitToString(queryChunkSizeDuration.getUnit()) + "]")
                 .addParameter("time", time)