diff --git a/.travis.yml b/.travis.yml
index 037e4e797d25..b8e1f17207d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 0.6
-script: "make build"
+  - 0.6
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f99b2303f5ce..e7a0f035f01f 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,14 @@ build:
 	@echo "Thanks for using Bootstrap,"
 	@echo "<3 @mdo and @fat\n"
 
+#
+# RUN JSHINT
+# TODO: run unittests
+#
+
+test:
+	jshint js/*.js --config js/.jshintrc
+	jshint js/tests/unit/*.js --config js/.jshintrc
 
 #
 # BUILD SIMPLE BOOTSTRAP DIRECTORY
diff --git a/package.json b/package.json
index 0c74adcd0204..c32979e53d36 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,24 @@
 {
-  "name": "bootstrap"
+    "name": "bootstrap"
   , "description": "HTML, CSS, and JS toolkit from Twitter."
   , "version": "2.0.3"
   , "keywords": ["bootstrap", "css"]
   , "homepage": "http://twitter.github.com/bootstrap/"
   , "author": "Twitter Inc."
+  , "scripts": { "test": "make test" }
   , "repository": {
-    "type": "git"
+      "type": "git"
     , "url": "https://github.com/twitter/bootstrap.git"
   }
   , "licenses": [
-    { "type": "Apache-2.0"
+    {
+        "type": "Apache-2.0"
       , "url": "http://www.apache.org/licenses/LICENSE-2.0"
     }
   ]
   , "devDependencies": {
-    "uglify-js": "*"
+      "uglify-js": "*"
     , "jshint": "*"
     , "recess": "*"
   }
-}
+}
\ No newline at end of file