diff --git a/package.json b/package.json
index a5666c3e36..1148c8b9e8 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
   "main": "build/build.js",
   "scripts": {
-    "pretest": "tsc ts/test/*Test.ts --module commonjs",
-    "test": "test"
+    "pretest": "tsc ts/tests/*Test.ts --module commonjs --outDir ./build/tests",
+    "test": "mocha ./build/tests/*.js"
   },
   "repository": {
     "type": "git",
diff --git a/ts/tests/docxTest.ts b/ts/tests/docxTest.ts
index e69de29bb2..d4326aedeb 100644
--- a/ts/tests/docxTest.ts
+++ b/ts/tests/docxTest.ts
@@ -0,0 +1,21 @@
+/// <reference path="../docx/docx.ts" />
+/// <reference path="../typings/mocha/mocha.d.ts" />
+describe('Calculator', () => {
+    var document : docx.Docx;
+
+    /*beforeEach(function () {
+        subject = new Calculator();
+    });
+
+    describe('#add', () => {
+        it('should add two numbers together', () => {
+            var result : number = subject.add(2, 3);
+            if (result !== 5) {
+                throw new Error('Expected 2 + 3 = 5 but was ' + result);
+            }
+        });
+    });*/
+    describe('#test', () => {
+        console.log(new docx.Docx);
+    });
+});
\ No newline at end of file
diff --git a/ts/tsconfig.json b/ts/tsconfig.json
index d05b3facaa..026b624e5a 100644
--- a/ts/tsconfig.json
+++ b/ts/tsconfig.json
@@ -7,5 +7,8 @@
         "outFile": "../build/build.js",
         "sourceRoot": "./",
         "rootDir": "./"
-    }
+    },
+    "exclude": [
+        "tests"
+    ]
 }
\ No newline at end of file