diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
index 8e2b4734b..15a757718 100644
--- a/on-finished/on-finished-tests.ts
+++ b/on-finished/on-finished-tests.ts
@@ -1,12 +1,15 @@
-/// <reference path="on-finished.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="./on-finished.d.ts" />
+
+import events = require('events');
 
 function test_finished() {
 
-	var msg = {};
+	var e = new events.EventEmitter();
 
-	var ret = onFinished(msg, () => {
+	var ret: NodeJS.EventEmitter = OnFinished.onFinished(e, () => {
 		//callback
 		});
 
-	var finished: boolean = isFinished(msg);
+	var finished: boolean = OnFinished.isFinished(e);
 }
diff --git a/on-finished/on-finished.d.ts b/on-finished/on-finished.d.ts
index b3916f513..e4e35c995 100644
--- a/on-finished/on-finished.d.ts
+++ b/on-finished/on-finished.d.ts
@@ -3,8 +3,10 @@
 // Definitions by: Honza Dvorsky <http://github.com/czechboy0>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module 'on-finished' {
+/// <reference path="../node/node.d.ts" />
 
-    export function onFinished(msg:any, listener:Function):any;
-    export function isFinished(msg:any):boolean;
+declare module OnFinished {
+
+    export function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
+    export function isFinished(msg:NodeJS.EventEmitter):boolean;
 }