diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
new file mode 100644
index 000000000..c3956ac6b
--- /dev/null
+++ b/on-finished/on-finished-tests.ts
@@ -0,0 +1,16 @@
+/// <reference path="../node/node.d.ts" />
+/// <reference path="./on-finished.d.ts" />
+
+import events = require('events');
+import onFinished = require('on-finished');
+
+function test_finished() {
+
+	var e = new events.EventEmitter();
+
+	var ret: NodeJS.EventEmitter = onFinished(e, () => {
+		//callback
+		});
+
+	var finished: boolean = onFinished.isFinished(e);
+}
diff --git a/on-finished/on-finished.d.ts b/on-finished/on-finished.d.ts
new file mode 100644
index 000000000..0ca4f2286
--- /dev/null
+++ b/on-finished/on-finished.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for on-finished v2.2.0
+// Project: https://github.com/jshttp/on-finished
+// Definitions by: Honza Dvorsky <http://github.com/czechboy0>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+
+declare module 'on-finished' {
+
+    function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
+
+    module onFinished {
+        export function isFinished(msg:NodeJS.EventEmitter):boolean;
+    }
+
+    export = onFinished;
+}