diff --git a/gyp/all.gyp b/build/node.gyp
similarity index 96%
rename from gyp/all.gyp
rename to build/node.gyp
index 2a15f7c2d67..856a8c02e53 100644
--- a/gyp/all.gyp
+++ b/build/node.gyp
@@ -159,6 +159,17 @@
       },
 
       'actions': [
+
+#        {
+#          'action_name': 'test',
+#          'inputs': [],
+#          'outputs': [],
+#          'action': [
+#            'python',
+#            '../tools/test.py',
+#          ],
+#        },
+
         {
           'action_name': 'node_js2c',
 
diff --git a/test/simple/test-executable-path.js b/test/simple/test-executable-path.js
index 2e3ff6be646..73948b66f17 100644
--- a/test/simple/test-executable-path.js
+++ b/test/simple/test-executable-path.js
@@ -26,15 +26,15 @@ var path = require('path');
 var isDebug = (process.version.indexOf('debug') >= 0);
 
 var debugPath = path.normalize(path.join(__dirname, '..', '..',
-                                         'build', 'debug', 'node_g'));
+                                         'out', 'Debug', 'node'));
 var defaultPath = path.normalize(path.join(__dirname, '..', '..',
-                                           'build', 'default', 'node'));
+                                           'out', 'Release', 'node'));
 
 console.error('debugPath: ' + debugPath);
 console.error('defaultPath: ' + defaultPath);
 console.error('process.execPath: ' + process.execPath);
 
-if (/node_g$/.test(process.execPath)) {
+if (isDebug) {
   assert.ok(process.execPath.indexOf(debugPath) == 0);
 } else {
   assert.ok(process.execPath.indexOf(defaultPath) == 0);
diff --git a/tools/test.py b/tools/test.py
index e05d020d71c..7c8156db0ec 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -663,9 +663,9 @@ class Context(object):
 
   def GetVm(self, mode):
     if mode == 'debug':
-      name = 'build/debug/node_g'
+      name = 'out/Debug/node'
     else:
-      name = 'build/default/node'
+      name = 'out/Release/node'
 
     if utils.IsWindows() and not name.endswith('.exe'):
       name = os.path.abspath(name + '.exe')