1 files changed, 20 insertions, 1 deletions
diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt
index af13bd2ce0b..691b1a618b0 100644
--- a/metrics/src/tests/CMakeLists.txt
+++ b/metrics/src/tests/CMakeLists.txt
@@ -1,8 +1,27 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# Runner for unit tests written in gtest.
+# NOTE: All new test classes should be added here.
+vespa_add_executable(metrics_gtest_runner_app TEST
+    SOURCES
+    countmetrictest.cpp
+    gtest_runner.cpp
+    DEPENDS
+    metrics
+    vdstestlib
+    gtest
+)
+
+vespa_add_test(
+    NAME metrics_gtest_runner_app
+    COMMAND metrics_gtest_runner_app
+    DEPENDS metrics_gtest_runner_app
+)
+
+# Runner for unit tests written in CppUnit (DEPRECATED).
 vespa_add_executable(metrics_testrunner_app TEST
     SOURCES
     testrunner.cpp
-    countmetrictest.cpp
     valuemetrictest.cpp
     metricsettest.cpp
     summetrictest.cpp