diff --git a/test/integration/client/type-coercion-tests.js b/test/integration/client/type-coercion-tests.js
new file mode 100644
index 00000000..95cc37db
--- /dev/null
+++ b/test/integration/client/type-coercion-tests.js
@@ -0,0 +1,62 @@
+var helper = require(__dirname + '/test-helper');
+
+var client = helper.client();
+
+client.query("create temp table test_type(col varchar(10))");
+
+var testForTypeCoercion = function(type){
+  test("Coerces " + type.name, function() {
+    client.query("drop table test_type")
+    client.query("create temp table test_type(col " + type.name + ")");
+    type.values.forEach(function(val) {
+
+      client.query({
+        name: 'insert type test ' + type.name,
+        text: 'insert into test_type(col) VALUES($1)',
+        values: [val]
+      });
+
+      var query = client.query({
+        name: 'get type ' + type.name ,
+        text: 'select col from test_type'
+      });
+
+      test('coerces ' + val + ' as ' + type.name, function() {
+        assert.raises(query, 'row', function(row) {
+          assert.strictEqual(row.fields[0], val);
+        });
+      });
+
+      client.query({
+        name: 'delete values',
+        text: 'delete from test_type'
+      });
+
+    });
+  });
+};
+
+//TODO test for nulls
+var types = [{
+  name: 'integer',
+  values: [1, -1]
+},{
+  name: 'smallint',
+  values: [-1, 0, 1]
+},{
+  name: 'bigint',
+  values: [-10000, 0, 10000]
+},{
+  name: 'varchar(5)',
+  values: ['yo', '', 'zomg!', null]
+},{
+  name: 'oid',
+  values: [0, 204410]
+},{
+  name: 'bool',
+  values: [true, false]
+}];
+
+types.forEach(testForTypeCoercion);
+
+client.on('drain', client.end.bind(client));