diff --git a/tests/unit/test_http_errors.py b/tests/unit/test_http_errors.py
index f2a7893..994db75 100644
--- a/tests/unit/test_http_errors.py
+++ b/tests/unit/test_http_errors.py
@@ -4,10 +4,6 @@ import httpretty
 from httpretty import GET, POST
 from ddt import ddt, data
 
-# TEMP: Temporary hack until httpretty string checking is fixed
-if httpretty.compat.PY3:
-    httpretty.core.basestring = (bytes, str)
-
 try:
     import unittest2 as unittest # Python2.6
 except ImportError:
diff --git a/tests/unit/test_system.py b/tests/unit/test_system.py
index 7cbdbec..d505d2b 100644
--- a/tests/unit/test_system.py
+++ b/tests/unit/test_system.py
@@ -3,10 +3,6 @@ import json
 import httpretty
 from httpretty import GET
 
-# TEMP: Temporary hack until httpretty string checking is fixed
-if httpretty.compat.PY3:
-    httpretty.core.basestring = (bytes, str)
-
 try:
     import unittest2 as unittest # Python2.6
 except ImportError:
diff --git a/tox.ini b/tox.ini
index e552382..7961499 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,17 +2,19 @@
 envlist = py26, py27, py33, coverage
 
 [testenv]
-commands = python -m unittest discover --catch tests/unit
+commands = python -m unittest discover tests/unit
 deps =
     mock >= 1.0.0
-    httpretty >= 0.6.1
+    # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
+    httpretty == 0.6.5
     ddt >= 0.3.0
 
 [testenv:py26]
-commands = unit2 discover --catch tests/unit
+commands = unit2 discover tests/unit
 deps =
     mock >= 1.0.0
-    httpretty >= 0.6.1
+    # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
+    httpretty == 0.6.5
     ddt >= 0.3.0
     unittest2
     discover
@@ -21,6 +23,7 @@ deps =
 commands = coverage run --source trovebox setup.py test
 deps =
     mock >= 1.0.0
-    httpretty >= 0.6.1
+    # Hold httpretty at 0.6.5 until https://github.com/gabrielfalcao/HTTPretty/issues/114 is resolved
+    httpretty == 0.6.5
     ddt >= 0.3.0
     coverage