diff --git a/test/build.test.js b/test/build.test.js
index 65daf69d..70cb83fd 100644
--- a/test/build.test.js
+++ b/test/build.test.js
@@ -263,6 +263,7 @@ apps.forEach(function(app) {
             });
         });
 
+        /* wait for https://github.com/nodejs/node-gyp/pull/1540
         test(app.name + ' configures with unparsed options ' + app.args, function(t) {
             run('node-pre-gyp', 'configure', '--loglevel=info -- -Dfoo=bar', app, {}, function(err,stdout,stderr) {
                 t.ifError(err);
@@ -284,6 +285,21 @@ apps.forEach(function(app) {
                 }
                 t.end();
             });
+        });*/
+
+        test(app.name + ' builds ' + app.args, function(t) {
+            run('node-pre-gyp', 'rebuild', '--loglevel=info', app, {}, function(err,stdout,stderr) {
+                t.ifError(err);
+                t.ok(stderr.search(/(gyp info spawn args).*(binding\.gyp)/) > -1);
+                if (process.platform == 'win32') {
+                    if (app.args.indexOf('--debug') > -1) {
+                        t.stringContains(stdout,'Debug\\'+app.name+'.pdb');
+                    } else {
+                        t.stringContains(stdout,'Release\\'+app.name+'.pdb');
+                    }
+                }
+                t.end();
+            });
         });
 
         test(app.name + ' is found ' + app.args, function(t) {