diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index aee37a4..5a79230 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -338,8 +338,6 @@
         'common/common_type_converters.h',
         'common/data_pipe_utils.cc',
         'common/data_pipe_utils.h',
-        'common/environment_data.cc',
-        'common/environment_data.h',
         'common/handle_watcher.cc',
         'common/handle_watcher.h',
         'common/message_pump_mojo.cc',
@@ -763,6 +761,9 @@
             'libmojo_system_java',
             'mojo_jni_headers',
           ],
+          'defines': [
+            'UNIT_TEST'  # As exported from testing/gtest.gyp:gtest.
+          ],
           'sources': [
             'android/javatests/mojo_test_case.cc',
             'android/javatests/mojo_test_case.h',