diff --git a/types/pg-types/index.d.ts b/types/pg-types/index.d.ts
index a09d44abab..e12529c85a 100644
--- a/types/pg-types/index.d.ts
+++ b/types/pg-types/index.d.ts
@@ -1,11 +1,9 @@
-// Type definitions for pg-types 1.11.0
+// Type definitions for pg-types 1.11
 // Project: https://github.com/brianc/node-pg-types
 // Definitions by: James Bracy <https://github.com/waratuman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface TypeParser {
-    (value: any): any;
-}
+export type TypeParser = (value: any) => any;
 
 export function getTypeParser(oid: number, format: string): TypeParser;
 
@@ -13,7 +11,5 @@ export function setTypeParser(oid: number, format: string, parseFn: TypeParser):
 export function setTypeParser(oid: number, parseFn: TypeParser): void;
 
 export namespace arrayParser {
-
-    export function create(source: any, transform: TypeParser): { parse: () => any[] };
-
-}
\ No newline at end of file
+    function create(source: any, transform: TypeParser): { parse(): any[] };
+}
diff --git a/types/pg-types/package.json b/types/pg-types/package.json
index fce08a048d..19e5fb0d14 100644
--- a/types/pg-types/package.json
+++ b/types/pg-types/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "moment": ">=2.14.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/pg-types/pg-types-tests.ts b/types/pg-types/pg-types-tests.ts
index 5b862d4507..9a86fa8f03 100644
--- a/types/pg-types/pg-types-tests.ts
+++ b/types/pg-types/pg-types-tests.ts
@@ -1,6 +1,4 @@
-/// <reference types="moment" />
 import * as types from "pg-types";
-import * as moment from "moment";
 
 types.getTypeParser(1184, 'text');
 
@@ -9,10 +7,7 @@ types.setTypeParser(1186, 'text', (value) => value === null ? null : value);
 types.setTypeParser(1186, 'binary', (value) => value.toISOString());
 types.setTypeParser(1185, (value) => types.arrayParser.create(value, (x) => x).parse());
 
-var TIMESTAMPTZ_OID = 1184
-var TIMESTAMP_OID = 1114
-var parseFn = function(val: any) {
-   return val === null ? null : moment(val)
-}
-types.setTypeParser(TIMESTAMPTZ_OID, parseFn)
-types.setTypeParser(TIMESTAMP_OID, parseFn)
+const TIMESTAMPTZ_OID = 1184;
+const TIMESTAMP_OID = 1114;
+types.setTypeParser(TIMESTAMPTZ_OID, parseInt);
+types.setTypeParser(TIMESTAMP_OID, parseInt);
diff --git a/types/pg-types/tsconfig.json b/types/pg-types/tsconfig.json
index d5f4abf341..1ab38690e5 100644
--- a/types/pg-types/tsconfig.json
+++ b/types/pg-types/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/pg-types/tslint.json b/types/pg-types/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/pg-types/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file