diff --git a/metrics/metrics.gyp b/metrics/metrics.gyp
index b2644ba23..67e7c379d 100644
--- a/metrics/metrics.gyp
+++ b/metrics/metrics.gyp
@@ -52,11 +52,6 @@
         'metrics_daemon_main.cc',
       ]
     },
-    {
-      'target_name': 'metrics_daemon',
-      'type': 'executable',
-      'dependencies': ['libmetrics_daemon'],
-    },
     {
       'target_name': 'metrics_client',
       'type': 'executable',
@@ -67,6 +62,15 @@
     },
   ],
   'conditions': [
+    ['USE_passive_metrics == 1', {
+      'targets': [
+        {
+          'target_name': 'metrics_daemon',
+          'type': 'executable',
+          'dependencies': ['libmetrics_daemon'],
+        },
+      ],
+    }],
     ['USE_test == 1', {
       'targets': [
         {
@@ -78,17 +82,6 @@
             'metrics_library_test.cc',
           ]
         },
-        {
-          'target_name': 'metrics_daemon_test',
-          'type': 'executable',
-          'dependencies': [
-            'libmetrics_daemon',
-          ],
-          'includes': ['../common-mk/common_test.gypi'],
-          'sources': [
-            'metrics_daemon_test.cc',
-          ]
-        },
         {
           'target_name': 'counter_test',
           'type': 'executable',
@@ -109,5 +102,20 @@
         },
       ],
     }],
+    ['USE_passive_metrics == 1 and USE_test == 1', {
+      'targets': [
+        {
+          'target_name': 'metrics_daemon_test',
+          'type': 'executable',
+          'dependencies': [
+            'libmetrics_daemon',
+          ],
+          'includes': ['../common-mk/common_test.gypi'],
+          'sources': [
+            'metrics_daemon_test.cc',
+          ]
+        },
+      ],
+    }],
   ],
 }