diff --git a/Makefile b/Makefile
index 0e8fb9a..819100b 100755
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,6 @@
 #
 
 build:
-	@echo "Running jshint..."
-	@./node_modules/.bin/jshint lib/ComicBook.js --config lib/.jshintrc
 	@echo "Compiling Handlebars templates..."
 	@./node_modules/.bin/handlebars templates/*.handlebars -f lib/templates.js
 	@echo "Compiling and minifying javascript..."
@@ -30,17 +28,6 @@ build:
 	@cp -r comicbook examples
 	@echo "Done"
 
-#
-# run jshint & quint tests
-#
-
-test:
-	@./node_modules/.bin/jshint lib/ComicBook.js --config lib/.jshintrc
-	@./node_modules/.bin/jshint lib/tests/unit/*.js --config lib/.jshintrc
-	@node lib/tests/server.js &
-	@./node_modules/.bin/phantomjs lib/tests/phantom.js "http://localhost:3000/lib/tests"
-	@kill -9 `cat lib/tests/pid.txt`
-	@rm lib/tests/pid.txt
 
 #
 # remove prior builds
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index 451c6fc..82052c8
--- a/package.json
+++ b/package.json
@@ -2,10 +2,17 @@
   "name": "comic-reader",
   "description": "A HTML5 comic book reader.",
   "version": "0.5.0",
-  "keywords": ["comic", "book", "reader"],
+  "keywords": [
+    "book",
+    "comic",
+    "reader"
+  ],
   "homepage": "http://reader.justforcomics.com",
-  "author": "Bala Clark",
-  "scripts": { "test": "make test" },
+  "author": "Bala Clark <balaclark@gmail.com>",
+  "scripts": {
+    "pretest": "standard lib/ComicBook.js",
+    "test": "make test"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/balaclark/HTML5-Comic-Book-Reader.git"
@@ -18,9 +25,8 @@
   ],
   "devDependencies": {
     "handlebars": "1.0.10",
-    "uglify-js": "1.3.4",
-    "jshint": "1.1.0",
-    "connect": "2.7.8",
-    "phantomjs": "1.9.0-3"
+    "mocha": "^2.2.5",
+    "standard": "^4.5.3",
+    "uglify-js": "1.3.4"
   }
 }