diff --git a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
index ad81c81c2d..57e8a625db 100644
--- a/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
+++ b/src/main/java/io/lettuce/core/metrics/CommandLatencyCollectorOptions.java
@@ -51,7 +51,7 @@ static CommandLatencyCollectorOptions disabled() {
      * @since 5.1
      */
     static CommandLatencyCollectorOptions.Builder builder() {
-        return CommandLatencyCollectorOptions.builder();
+        return DefaultCommandLatencyCollectorOptions.builder();
     }
 
     /**
diff --git a/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
new file mode 100644
index 0000000000..8994f3af55
--- /dev/null
+++ b/src/test/java/io/lettuce/core/metrics/CommandLatencyCollectorOptionsUnitTests.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.lettuce.core.metrics;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CommandLatencyCollectorOptionsUnitTests {
+
+    @Test()
+    void testBuilder() {
+
+        CommandLatencyCollectorOptions sut = CommandLatencyCollectorOptions.builder()
+                .targetUnit(TimeUnit.HOURS).targetPercentiles(new double[] { 1, 2, 3 }).build();
+
+        assertThat(sut.targetPercentiles()).hasSize(3);
+        assertThat(sut.targetUnit()).isEqualTo(TimeUnit.HOURS);
+    }
+}