diff --git a/deps/gtest/gtest.gyp b/deps/gtest/gtest.gyp
index c7c850c52cb83f..fdac53ded31294 100644
--- a/deps/gtest/gtest.gyp
+++ b/deps/gtest/gtest.gyp
@@ -3,11 +3,22 @@
     {
       'target_name': 'gtest',
       'type': 'static_library',
-      'cflags': ['-Wno-missing-field-initializers'],
+      'cflags': [
+        '-Wno-missing-field-initializers',
+      ],
       'direct_dependent_settings': {
-        'include_dirs': ['include'],
+        'include_dirs': [
+          'include',
+        ],
       },
-      'include_dirs': ['.', 'include'],
+      'defines': [
+        'GTEST_LANG_CXX11=1',
+        'GTEST_HAS_TR1_TUPLE=0',
+      ],
+      'include_dirs': [
+        '.',
+        'include',
+      ],
       'sources': [
         'src/gtest-death-test.cc',
         'src/gtest-filepath.cc',
@@ -18,6 +29,26 @@
         'src/gtest-typed-test.cc',
         'src/gtest.cc',
         'src/gtest_main.cc',
+        'include/gtest/internal/gtest-death-test-internal.h',
+        'include/gtest/internal/gtest-filepath.h',
+        'include/gtest/internal/gtest-internal.h',
+        'include/gtest/internal/gtest-linked_ptr.h',
+        'include/gtest/internal/gtest-param-util.h',
+        'include/gtest/internal/gtest-param-util-generated.h',
+        'include/gtest/internal/gtest-port.h',
+        'include/gtest/internal/gtest-string.h',
+        'include/gtest/internal/gtest-tuple.h',
+        'include/gtest/internal/gtest-type-util.h',
+        'include/gtest/gtest.h',
+        'include/gtest/gtest-death-test.h',
+        'include/gtest/gtest-message.h',
+        'include/gtest/gtest-param-test.h',
+        'include/gtest/gtest-printers.h',
+        'include/gtest/gtest-spi.h',
+        'include/gtest/gtest-test-part.h',
+        'include/gtest/gtest-typed-test.h',
+        'include/gtest/gtest_pred_impl.h',
+        'include/gtest/gtest_prod.h',
       ],
     }
   ],
diff --git a/node.gyp b/node.gyp
index d3f574b1e8e4af..50319c92834573 100644
--- a/node.gyp
+++ b/node.gyp
@@ -826,20 +826,28 @@
         'deps/uv/include',
       ],
 
-      'defines': [ 'NODE_WANT_INTERNALS=1' ],
+      'defines': [
+        'NODE_WANT_INTERNALS=1',
+        'GTEST_LANG_CXX11=1',
+        'GTEST_HAS_TR1_TUPLE=0',
+      ],
 
       'sources': [
         'test/cctest/node_test_fixture.cc',
         'test/cctest/test_aliased_buffer.cc',
         'test/cctest/test_base64.cc',
-        'test/cctest/test_node_postmortem_metadata.cc',
         'test/cctest/test_environment.cc',
+        # Listed here for completeness. Actual inclusion is conditional.
+        # 'test/cctest/test_inspector_socket.cc',
+        # 'test/cctest/test_inspector_socket_server.cc',
         'test/cctest/test_linked_binding.cc',
+        'test/cctest/test_node_postmortem_metadata.cc',
         'test/cctest/test_platform.cc',
         'test/cctest/test_report_util.cc',
         'test/cctest/test_traced_value.cc',
+        'test/cctest/test_url.cc',
         'test/cctest/test_util.cc',
-        'test/cctest/test_url.cc'
+        'test/cctest/node_test_fixture.h',
       ],
 
       'conditions': [