diff --git a/Makefile b/Makefile
index 2fb8461..a377dba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-all: check_dependencies unit functional integration doctest
+all: check_dependencies unit functional
 
 filename=httpretty-`python -c 'import httpretty;print httpretty.version'`.tar.gz
 
-#export PYTHONPATH:= ${PWD}
 export HTTPRETTY_DEPENDENCIES:= nose sure
 
 check_dependencies:
@@ -19,16 +18,6 @@ functional: clean
 	@echo "Running functional tests ..."
 	@nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/functional --cover-package=httpretty
 
-integration: clean
-	@echo "Running integration tests ..."
-	@nosetests -s --verbosity=2 tests/integration
-
-doctest: clean
-	@cd docs && make doctest
-
-documentation:
-	@cd docs && make html
-
 clean:
 	@printf "Cleaning up files that are already in .gitignore... "
 	@for pattern in `cat .gitignore`; do rm -rf $$pattern; done
diff --git a/README.md b/README.md
index 076b77c..e019d04 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ you will need **ONLY** if you decide to contribute to HTTPretty which means you'
 1. fork and clone the project
 2. install the dependencies above
 3. run the tests with make:
-    > make unit functional integration
+    > make unit functional
 4. hack at will
 5. commit, push etc
 6. send a pull request
diff --git a/tests/functional/test_urllib2.py b/tests/functional/test_urllib2.py
index 0eb6993..cd76d58 100644
--- a/tests/functional/test_urllib2.py
+++ b/tests/functional/test_urllib2.py
@@ -28,7 +28,7 @@ import urllib2
 from sure import that, within, microseconds
 from httpretty import HTTPretty
 
-#@within(five=microseconds) # ensure time to timeout actual request
+@within(five=microseconds)
 def test_httpretty_should_mock_a_simple_get_with_urllib2_read():
     u"HTTPretty should mock a simple GET with urllib2.read()"
 
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
deleted file mode 100644
index 1e59f4f..0000000
--- a/tests/integration/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# <HTTPretty - HTTP client mock for Python>
-# Copyright (C) <2011>  Gabriel Falcão <gabriel@nacaolivre.org>
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-