diff --git a/Makefile b/Makefile
index 87c7140..b3209b1 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ ifeq (node, $(BIN))
 	FLAGS = --harmony-generators
 endif
 
+REQUIRED = --require should --require should-http
+
 TESTS = test/application \
 	test/context/* \
 	test/request/* \
@@ -21,7 +23,7 @@ TESTS = test/application \
 test:
 	@NODE_ENV=test $(BIN) $(FLAGS) \
 		./node_modules/.bin/_mocha \
-		--require should \
+		$(REQUIRED) \
 		$(TESTS) \
 		--bail
 
@@ -30,7 +32,7 @@ test-cov:
 		./node_modules/.bin/istanbul cover \
 		./node_modules/.bin/_mocha \
 		-- -u exports \
-		--require should \
+		$(REQUIRED) \
 		$(TESTS) \
 		--bail
 
@@ -40,7 +42,7 @@ test-travis:
 		./node_modules/.bin/_mocha \
 		--report lcovonly \
 		-- -u exports \
-		--require should \
+		$(REQUIRED) \
 		$(TESTS) \
 		--bail
 
diff --git a/package.json b/package.json
index e2d1d88..c6c472f 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,8 @@
     "istanbul-harmony": "~0.3.0",
     "make-lint": "^1.0.1",
     "mocha": "^2.0.1",
-    "should": "^3.1.0",
+    "should": "^6.0.3",
+    "should-http": "0.0.3",
     "supertest": "^1.0.1",
     "test-console": "^0.7.1"
   },