diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build
 doc
 !doc/Theme.css
 example/stress/test
+node_modules
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "vendor/nodeunit"]
-	path = vendor/nodeunit
-	url = git://github.com/caolan/nodeunit.git
-[submodule "vendor/rimraf"]
-	path = vendor/rimraf
-	url = git://github.com/isaacs/rimraf.git
 [submodule "vendor/libgit2"]
 	path = vendor/libgit2
 	url = git://github.com/libgit2/libgit2.git

diff --git a/Makefile b/Makefile
@@ -41,9 +41,6 @@ clean:
 	@@rm -rf $(BASE)/build/
 	@@rm -rf $(BASE)/vendor/libgit2/build/
 
-test:
-	@@$(NODE_JS) $(BASE)/test/index.js test
-
 lint:
 	@@$(NODE_JS) $(BASE)/util/hint-check.js
 

diff --git a/package.json b/package.json
@@ -16,8 +16,13 @@
   "engines": {
     "node": "~0.6"
   },
+  "devDependencies": {
+    "nodeunit": "0.6.x",
+    "rimraf": "1.0.x"
+  },
   "scripts": {
     "preinstall": "./configure",
-    "install": "make"
+    "install": "make",
+    "test": "cd test && nodeunit *.js"
   }
 }
diff --git a/test/convenience-repo.js b/test/convenience-repo.js
@@ -1,5 +1,5 @@
 var git = require( "../" );
-var rimraf = require( "../vendor/rimraf");
+var rimraf = require("rimraf");
 var fs = require( "fs" );
 
 // Helper functions

diff --git a/test/index.js b/test/index.js
diff --git a/test/raw-blob.js b/test/raw-blob.js
@@ -1,6 +1,6 @@
 var git = require( '../' ).raw
   , path = require( 'path' )
-  , rimraf = require( '../vendor/rimraf' );
+  , rimraf = require('rimraf');
 
 var testRepo = new git.Repo();
 

diff --git a/test/raw-commit.js b/test/raw-commit.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' ),
+    rimraf = require( 'rimraf' ),
     path = require( 'path' );
 
 var testRepo = new git.Repo();

diff --git a/test/raw-error.js b/test/raw-error.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {

diff --git a/test/raw-object.js b/test/raw-object.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {

diff --git a/test/raw-oid.js b/test/raw-oid.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {

diff --git a/test/raw-reference.js b/test/raw-reference.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {

diff --git a/test/raw-repo.js b/test/raw-repo.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' ),
+    rimraf = require('rimraf'),
     path = require( 'path' ),
     fs = require( 'fs' );
 

diff --git a/test/raw-revwalk.js b/test/raw-revwalk.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
+    rimraf = require('rimraf');
 
 var testRepo = new git.Repo();
 

diff --git a/vendor/nodeunit b/vendor/nodeunit
diff --git a/vendor/rimraf b/vendor/rimraf