diff --git a/lib/native.js b/lib/native.js
index c7d78de..87fdcb8 100644
--- a/lib/native.js
+++ b/lib/native.js
@@ -131,12 +131,12 @@ var NativeQuery = function(text, values, callback) {
     this.name = text.name;
   } else {
     this.text = text;
-    this.callback = callback;
     this.values = values;
-  }
-  if(typeof values == 'function') {
-    this.values = null;
-    this.callback = values;
+    this.callback = callback;
+    if(typeof values == 'function') {
+      this.values = null;
+      this.callback = values;
+    }
   }
   if(this.callback) {
     this.rows = [];
diff --git a/test/integration/client/no-data-tests.js b/test/integration/client/no-data-tests.js
index a47f3bd..341d728 100644
--- a/test/integration/client/no-data-tests.js
+++ b/test/integration/client/no-data-tests.js
@@ -1,14 +1,14 @@
 var helper = require(__dirname + '/test-helper');
 
 test("noData message handling", function() {
-  return false;
+
   var client = helper.client();
-  
+
   var q = client.query({
     name: 'boom',
     text: 'create temp table boom(id serial, size integer)'
   });
-  
+
   client.query({
     name: 'insert',
     text: 'insert into boom(size) values($1)',
@@ -25,7 +25,7 @@ test("noData message handling", function() {
     text: 'insert into boom(size) values($1)',
     values: [101]
   });
-  
+
   var query = client.query({
     name: 'fetch',
     text: 'select size from boom where size < $1',
@@ -37,5 +37,5 @@ test("noData message handling", function() {
   });
 
   client.on('drain', client.end.bind(client));
-  
+
 });