diff --git a/src/Test/TestNoparallel.py b/src/Test/TestNoparallel.py
index abc4c767..736bf4ea 100644
--- a/src/Test/TestNoparallel.py
+++ b/src/Test/TestNoparallel.py
@@ -1,10 +1,7 @@
 import time
 
-import gevent
-from gevent import monkey
-monkey.patch_all()
-
 import util
+import gevent
 
 class ExampleClass(object):
     def __init__(self):
diff --git a/src/Test/TestRateLimit.py b/src/Test/TestRateLimit.py
index a823d88b..b0a91ba0 100644
--- a/src/Test/TestRateLimit.py
+++ b/src/Test/TestRateLimit.py
@@ -1,8 +1,6 @@
 import time
 
 import gevent
-from gevent import monkey
-monkey.patch_all()
 
 from util import RateLimit
 
diff --git a/src/Test/TestWeb.py b/src/Test/TestWeb.py
index 72a34a5a..e1137dcf 100644
--- a/src/Test/TestWeb.py
+++ b/src/Test/TestWeb.py
@@ -18,7 +18,7 @@ class WaitForPageLoad(object):
         self.old_page = self.browser.find_element_by_tag_name('html')
 
     def __exit__(self, *args):
-        WebDriverWait(self.browser, 20).until(staleness_of(self.old_page))
+        WebDriverWait(self.browser, 5).until(staleness_of(self.old_page))
 
 
 @pytest.mark.usefixtures("resetSettings")
@@ -34,10 +34,6 @@ class TestWeb:
         assert "Forbidden" in urllib.urlopen("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/..//sites.json" % site_url).read()
         assert "Forbidden" in urllib.urlopen("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/../../zeronet.py" % site_url).read()
 
-    def testHomepage(self, browser, site_url):
-        browser.get("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr" % site_url)
-        assert browser.title == "ZeroHello - ZeroNet"
-
     def testLinkSecurity(self, browser, site_url):
         browser.get("%s/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/test/security.html" % site_url)
         assert browser.title == "ZeroHello - ZeroNet"
diff --git a/src/Test/conftest.py b/src/Test/conftest.py
index 905aa2b0..7c0f9fd7 100644
--- a/src/Test/conftest.py
+++ b/src/Test/conftest.py
@@ -49,7 +49,7 @@ if os.path.isfile("%s-temp/content.db" % config.data_dir):
 
 import gevent
 from gevent import monkey
-monkey.patch_all(thread=False)
+monkey.patch_all(thread=False, subprocess=False)
 
 from Site import Site
 from Site import SiteManager
@@ -164,7 +164,9 @@ def user():
 def browser():
     try:
         from selenium import webdriver
-        browser = webdriver.PhantomJS(executable_path=PHANTOMJS_PATH, service_log_path=os.path.devnull)
+        print "Starting phantomjs..."
+        browser = webdriver.PhantomJS(executable_path=PHANTOMJS_PATH)
+        print "Set window size..."
         browser.set_window_size(1400, 1000)
     except Exception, err:
         raise pytest.skip("Test requires selenium + phantomjs: %s" % err)