diff --git a/test/integration/client/timezone-tests.js b/test/integration/client/timezone-tests.js
new file mode 100644
index 00000000..b355550d
--- /dev/null
+++ b/test/integration/client/timezone-tests.js
@@ -0,0 +1,29 @@
+var helper = require(__dirname + '/../test-helper');
+var exec = require('child_process').exec;
+
+var oldTz = process.env.TZ;
+process.env.TZ = 'Europe/Berlin';
+
+var date = new Date();
+
+helper.pg.connect(helper.config, function(err, client, done) {
+  assert.isNull(err);
+
+  test('timestamp without time zone', function() {
+    client.query("SELECT CAST($1 AS TIMESTAMP WITHOUT TIME ZONE) AS \"val\"", [ date ], function(err, result) {
+      assert.isNull(err);
+      assert.equal(result.rows[0].val.getTime(), date.getTime());
+
+      test('timestamp with time zone', function() {
+        client.query("SELECT CAST($1 AS TIMESTAMP WITH TIME ZONE) AS \"val\"", [ date ], function(err, result) {
+          assert.isNull(err);
+          assert.equal(result.rows[0].val.getTime(), date.getTime());
+
+          done();
+          helper.pg.end();
+          process.env.TZ = oldTz;
+        });
+      });
+    });
+  });
+});
\ No newline at end of file