diff --git a/test/integration/connection/test-typecast.js b/test/integration/connection/test-typecast.js
index db5a741abe..ed12036ce9 100644
--- a/test/integration/connection/test-typecast.js
+++ b/test/integration/connection/test-typecast.js
@@ -5,77 +5,152 @@ const connection = common.createConnection();
 const assert = require('assert');
 
 connection.query('CREATE TEMPORARY TABLE json_test (json_test JSON)');
-connection.query('INSERT INTO json_test VALUES (?)', JSON.stringify({ test: 42 }));
+connection.query(
+  'INSERT INTO json_test VALUES (?)',
+  JSON.stringify({ test: 42 }),
+);
+
+connection.query(
+  'CREATE TEMPORARY TABLE geom_test (p POINT, g GEOMETRY NOT NULL)',
+);
+connection.query(
+  'INSERT INTO geom_test VALUES (ST_GeomFromText("POINT(1 1)"), ' +
+    'ST_GeomFromText("LINESTRING(-71.160281 42.258729,-71.160837 42.259113,-71.161144 42.25932)"))',
+);
 
 connection.query(
   {
     sql: 'select "foo uppercase" as foo',
-    typeCast: function(field, next) {
-      assert.equal("number", typeof field.length);
+    typeCast: function (field, next) {
+      assert.equal('number', typeof field.length);
       if (field.type === 'VAR_STRING') {
-
         return field.string().toUpperCase();
       }
       return next();
-    }
+    },
   },
   (err, res) => {
     assert.ifError(err);
     assert.equal(res[0].foo, 'FOO UPPERCASE');
-  }
+  },
 );
 
 connection.query(
   {
     sql: 'select "foobar" as foo',
-    typeCast: false
+    typeCast: false,
   },
   (err, res) => {
     assert.ifError(err);
     assert(Buffer.isBuffer(res[0].foo));
     assert.equal(res[0].foo.toString('utf8'), 'foobar');
-  }
+  },
 );
 
 connection.query(
   {
     sql: 'SELECT NULL as test, 6 as value;',
-    typeCast: function(field, next) {
+    typeCast: function (field, next) {
       return next();
-    }
+    },
   },
   (err, _rows) => {
     assert.ifError(err);
     assert.equal(_rows[0].test, null);
     assert.equal(_rows[0].value, 6);
-  }
+  },
 );
 
-
 connection.query(
   {
     sql: 'SELECT * from json_test',
-    typeCast: function(_field, next) {
+    typeCast: function (_field, next) {
       return next();
-    }
+    },
   },
   (err, _rows) => {
     assert.ifError(err);
     assert.equal(_rows[0].json_test.test, 42);
-  }
+  },
 );
 
 connection.execute(
   {
     sql: 'SELECT * from json_test',
-    typeCast: function(_field, next) {
+    typeCast: function (_field, next) {
       return next();
-    }
+    },
   },
   (err, _rows) => {
     assert.ifError(err);
     assert.equal(_rows[0].json_test.test, 42);
-  }
+  },
+);
+
+// read geo fields
+connection.query(
+  {
+    sql: 'select * from geom_test',
+  },
+  (err, res) => {
+    assert.ifError(err);
+    assert.deepEqual({ x: 1, y: 1 }, res[0].p);
+    assert.deepEqual(
+      [
+        { x: -71.160281, y: 42.258729 },
+        { x: -71.160837, y: 42.259113 },
+        { x: -71.161144, y: 42.25932 },
+      ],
+      res[0].g,
+    );
+  },
+);
+
+connection.query(
+  {
+    sql: 'select * from geom_test',
+    typeCast: function (field, next) {
+      assert.equal('geom_test', field.table);
+
+      if (field.name === 'p' && field.type === 'GEOMETRY') {
+        assert.deepEqual({ x: 1, y: 1 }, field.geometry());
+        return { x: 2, y: 2 };
+      }
+
+      if (field.name === 'g' && field.type === 'GEOMETRY') {
+        assert.deepEqual(
+          [
+            { x: -71.160281, y: 42.258729 },
+            { x: -71.160837, y: 42.259113 },
+            { x: -71.161144, y: 42.25932 },
+          ],
+          field.geometry(),
+        );
+
+        return [
+          { x: -70, y: 40 },
+          { x: -60, y: 50 },
+          { x: -50, y: 60 },
+        ];
+      }
+
+      assert.fail('should not reach here');
+
+      return next();
+    },
+  },
+  (err, res) => {
+    assert.ifError(err);
+    assert.deepEqual({ x: 2, y: 2 }, res[0].p);
+    assert.deepEqual(
+      [
+        { x: -70, y: 40 },
+        { x: -60, y: 50 },
+        { x: -50, y: 60 },
+      ],
+      res[0].g,
+    );
+  },
 );
 
 connection.end();