diff --git a/.gitignore b/.gitignore
index 49a7b95ac..656f1cda5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,8 @@ Properties
 *~
 
 # test folder
-!_tests/*
-!_tests/*.js
-!_tests/*/*.js
-!_tests/*/*/*.js
-!_tests/*/*/*/*.js
+!_infrastructure/tests/*
+!_infrastructure/tests/*.js
+!_infrastructure/tests/*/*.js
+!_infrastructure/tests/*/*/*.js
+!_infrastructure/tests/*/*/*/*.js
diff --git a/_tests/src/exec.js b/_infrastructure/tests/src/exec.js
similarity index 100%
rename from _tests/src/exec.js
rename to _infrastructure/tests/src/exec.js
diff --git a/_tests/src/exec.ts b/_infrastructure/tests/src/exec.ts
similarity index 100%
rename from _tests/src/exec.ts
rename to _infrastructure/tests/src/exec.ts
diff --git a/_tests/src/io.js b/_infrastructure/tests/src/io.js
similarity index 100%
rename from _tests/src/io.js
rename to _infrastructure/tests/src/io.js
diff --git a/_tests/src/io.ts b/_infrastructure/tests/src/io.ts
similarity index 100%
rename from _tests/src/io.ts
rename to _infrastructure/tests/src/io.ts
diff --git a/_tests/testRunner.js b/_infrastructure/tests/testRunner.js
similarity index 99%
rename from _tests/testRunner.js
rename to _infrastructure/tests/testRunner.js
index 1d13574ee..9725acc56 100644
--- a/_tests/testRunner.js
+++ b/_infrastructure/tests/testRunner.js
@@ -485,7 +485,7 @@ var IO = (function () {
 var cfg = {
     root: '.',
     pattern: /.\-tests\.ts/g,
-    tsc: 'node ./_tests/typescript_0.8.2/tsc.js ',
+    tsc: 'node ./_infrastructure/tests/typescript_0.8.2/tsc.js ',
     exclude: {
         '.git': true,
         '.gitignore': true,
diff --git a/_tests/testRunner.ts b/_infrastructure/tests/testRunner.ts
similarity index 98%
rename from _tests/testRunner.ts
rename to _infrastructure/tests/testRunner.ts
index 0472330a5..557463845 100644
--- a/_tests/testRunner.ts
+++ b/_infrastructure/tests/testRunner.ts
@@ -4,7 +4,7 @@
 var cfg = {
     root: '.',
     pattern: /.\-tests\.ts/g,
-    tsc: 'node ./_tests/typescript_0.8.2/tsc.js ',
+    tsc: 'node ./_infrastructure/tests/typescript_0.8.2/tsc.js ',
     exclude: {
         '.git': true,
         '.gitignore': true,
diff --git a/_tests/typescript_0.8.2/lib.d.ts b/_infrastructure/tests/typescript_0.8.2/lib.d.ts
similarity index 100%
rename from _tests/typescript_0.8.2/lib.d.ts
rename to _infrastructure/tests/typescript_0.8.2/lib.d.ts
diff --git a/_tests/typescript_0.8.2/tsc b/_infrastructure/tests/typescript_0.8.2/tsc
similarity index 100%
rename from _tests/typescript_0.8.2/tsc
rename to _infrastructure/tests/typescript_0.8.2/tsc
diff --git a/_tests/typescript_0.8.2/tsc.js b/_infrastructure/tests/typescript_0.8.2/tsc.js
similarity index 100%
rename from _tests/typescript_0.8.2/tsc.js
rename to _infrastructure/tests/typescript_0.8.2/tsc.js
diff --git a/_tests/typescript_0.8.2/typescript.js b/_infrastructure/tests/typescript_0.8.2/typescript.js
similarity index 100%
rename from _tests/typescript_0.8.2/typescript.js
rename to _infrastructure/tests/typescript_0.8.2/typescript.js
diff --git a/package.json b/package.json
index 28dc7172a..e2b00d192 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,6 @@
 	"name": "DefinitelyTyped",
 	"version": "0.0.0",
     "scripts": {
-        "test": "node ./_tests/testRunner.js"
+        "test": "node ./_infrastructure/tests/testRunner.js"
     }
 }