diff --git a/simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilder.java b/simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilder.java
index 831608921..30435b7ce 100644
--- a/simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilder.java
+++ b/simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilder.java
@@ -58,8 +58,8 @@ public Collector.MetricFamilySamples.Sample createSample(final String dropwizard
 
         return defaultMetricSampleBuilder.createSample(
                 dropwizardName, nameSuffix,
-                Collections.<String>emptyList(),
-                Collections.<String>emptyList(),
+                additionalLabelNames,
+                additionalLabelValues,
                 value
         );
     }
diff --git a/simpleclient_dropwizard/src/test/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilderTest.java b/simpleclient_dropwizard/src/test/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilderTest.java
index 21f9fa1f0..b906fbbf6 100644
--- a/simpleclient_dropwizard/src/test/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilderTest.java
+++ b/simpleclient_dropwizard/src/test/java/io/prometheus/client/dropwizard/samplebuilder/CustomMappingSampleBuilderTest.java
@@ -13,7 +13,7 @@
 
 public class CustomMappingSampleBuilderTest {
     @Test(expected = IllegalArgumentException.class)
-    public void test_WHEN_EmptyConfig_THEN_ShouldReturnDefaultSample() {
+    public void test_WHEN_EmptyConfig_THEN_Fail() {
         final CustomMappingSampleBuilder converter = new CustomMappingSampleBuilder(Collections.<MapperConfig>emptyList());
     }
 
@@ -26,9 +26,9 @@ public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
         );
         final CustomMappingSampleBuilder converter = new CustomMappingSampleBuilder(mapperConfigs);
         final Collector.MetricFamilySamples.Sample result = converter.createSample(
-                "app.okhttpclient.client.HttpClient.service.total", "", Collections.<String>emptyList(), Collections.<String>emptyList(), 0d);
+                "app.okhttpclient.client.HttpClient.service.total", "", Collections.singletonList("quantile"), Collections.singletonList("0.99"), 0d);
 
-        assertEquals(new Collector.MetricFamilySamples.Sample("app_okhttpclient_client_HttpClient_service_total", Collections.<String>emptyList(), Collections.<String>emptyList(), 0d), result);
+        assertEquals(new Collector.MetricFamilySamples.Sample("app_okhttpclient_client_HttpClient_service_total", Collections.singletonList("quantile"), Collections.singletonList("0.99"), 0d), result);
     }
 
     @Test
@@ -178,4 +178,4 @@ public void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
 
         assertEquals(expectedResult, result);
     }
-}
\ No newline at end of file
+}