diff --git a/gcloud/datastore/test_connection.py b/gcloud/datastore/test_connection.py
index b243e52cb2a4..64355bc360b6 100644
--- a/gcloud/datastore/test_connection.py
+++ b/gcloud/datastore/test_connection.py
@@ -672,10 +672,6 @@ def test_save_entity_w_transaction(self):
         mutation = datastore_pb.Mutation()
 
         class Xact(object):
-
-            def id(self):
-                return 'xact'
-
             def mutation(self):
                 return mutation
         DATASET_ID = 'DATASET'
@@ -746,10 +742,6 @@ def test_delete_entities_w_transaction(self):
         mutation = datastore_pb.Mutation()
 
         class Xact(object):
-
-            def id(self):
-                return 'xact'
-
             def mutation(self):
                 return mutation
         DATASET_ID = 'DATASET'
@@ -821,10 +813,6 @@ def test_delete_entity_w_transaction(self):
         mutation = datastore_pb.Mutation()
 
         class Xact(object):
-
-            def id(self):
-                return 'xact'
-
             def mutation(self):
                 return mutation
         DATASET_ID = 'DATASET'
diff --git a/gcloud/datastore/test_entity.py b/gcloud/datastore/test_entity.py
index 21d45f6540c1..4de1c75cd455 100644
--- a/gcloud/datastore/test_entity.py
+++ b/gcloud/datastore/test_entity.py
@@ -20,8 +20,6 @@ def _makeOne(self, dataset=_MARKER, kind=_KIND):
         klass = self._getTargetClass()
         if dataset is _MARKER:
             dataset = Dataset(_DATASET_ID)
-        if kind is _MARKER:
-            kind = _KIND
         return klass(dataset, kind)
 
     def test_ctor_defaults(self):
@@ -215,9 +213,6 @@ def connection(self):
     def get_entity(self, key):
         return self.get(key)
 
-    def get_entities(self, keys):
-        return [self.get(x) for x in keys]
-
 
 class _Connection(object):
     _transaction = _saved = _deleted = None
diff --git a/gcloud/storage/test_iterator.py b/gcloud/storage/test_iterator.py
index 582fbd861e91..738b3000b300 100644
--- a/gcloud/storage/test_iterator.py
+++ b/gcloud/storage/test_iterator.py
@@ -365,24 +365,14 @@ def __init__(self, *responses):
         self._requested = []
 
     def make_request(self, **kw):
-        from gcloud.storage.exceptions import NotFoundError
         self._requested.append(kw)
-        try:
-            response, self._responses = self._responses[0], self._responses[1:]
-        except:
-            raise NotFoundError('miss', None)
-        else:
-            return response
+        response, self._responses = self._responses[0], self._responses[1:]
+        return response
 
     def api_request(self, **kw):
-        from gcloud.storage.exceptions import NotFoundError
         self._requested.append(kw)
-        try:
-            response, self._responses = self._responses[0], self._responses[1:]
-        except:
-            raise NotFoundError('miss', None)
-        else:
-            return response
+        response, self._responses = self._responses[0], self._responses[1:]
+        return response
 
     def build_api_url(self, path, query_params=None):
         from urllib import urlencode
diff --git a/gcloud/storage/test_key.py b/gcloud/storage/test_key.py
index 9c8e773c815b..5926fea7ff19 100644
--- a/gcloud/storage/test_key.py
+++ b/gcloud/storage/test_key.py
@@ -156,9 +156,9 @@ def test_set_contents_from_file(self):
         KEY = 'key'
         UPLOAD_URL = 'http://example.com/upload/name/key'
         DATA = 'ABCDEF'
-        loc_response = _Response(location=UPLOAD_URL)
-        chunk1_response = _Response()
-        chunk2_response = _Response()
+        loc_response = {'location': UPLOAD_URL}
+        chunk1_response = {}
+        chunk2_response = {}
         connection = _Connection((loc_response, ''),
                                  (chunk1_response, ''),
                                  (chunk2_response, ''),
@@ -201,9 +201,9 @@ def test_set_contents_from_filename(self):
         KEY = 'key'
         UPLOAD_URL = 'http://example.com/upload/name/key'
         DATA = 'ABCDEF'
-        loc_response = _Response(location=UPLOAD_URL)
-        chunk1_response = _Response()
-        chunk2_response = _Response()
+        loc_response = {'location': UPLOAD_URL}
+        chunk1_response = {}
+        chunk2_response = {}
         connection = _Connection((loc_response, ''),
                                  (chunk1_response, ''),
                                  (chunk2_response, ''),
@@ -245,9 +245,9 @@ def test_set_contents_from_string(self):
         KEY = 'key'
         UPLOAD_URL = 'http://example.com/upload/name/key'
         DATA = 'ABCDEF'
-        loc_response = _Response(location=UPLOAD_URL)
-        chunk1_response = _Response()
-        chunk2_response = _Response()
+        loc_response = {'location': UPLOAD_URL}
+        chunk1_response = {}
+        chunk2_response = {}
         connection = _Connection((loc_response, ''),
                                  (chunk1_response, ''),
                                  (chunk2_response, ''),
@@ -556,12 +556,6 @@ def test_make_public(self):
         self.assertEqual(kw[0]['query_params'], {'projection': 'full'})
 
 
-class _Response(dict):
-    @property
-    def status(self):
-        return self.get('status', 200)
-
-
 class _Connection(object):
     API_BASE_URL = 'http://example.com'
 
@@ -570,24 +564,14 @@ def __init__(self, *responses):
         self._requested = []
 
     def make_request(self, **kw):
-        from gcloud.storage.exceptions import NotFoundError
         self._requested.append(kw)
-        try:
-            response, self._responses = self._responses[0], self._responses[1:]
-        except:
-            raise NotFoundError('miss', None)
-        else:
-            return response
+        response, self._responses = self._responses[0], self._responses[1:]
+        return response
 
     def api_request(self, **kw):
-        from gcloud.storage.exceptions import NotFoundError
         self._requested.append(kw)
-        try:
-            response, self._responses = self._responses[0], self._responses[1:]
-        except:
-            raise NotFoundError('miss', None)
-        else:
-            return response
+        response, self._responses = self._responses[0], self._responses[1:]
+        return response
 
     def build_api_url(self, path, query_params=None,
                       api_base_url=API_BASE_URL):
diff --git a/tox.ini b/tox.ini
index 4e49a7656372..8edf78a28df9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps =
 basepython =
     python2.7
 commands =
-    nosetests --with-xunit --with-xcoverage --cover-package=gcloud --nocapture --cover-erase
+    nosetests --with-xunit --with-xcoverage --cover-package=gcloud --nocapture --cover-erase --cover-tests
 deps =
     nose
     unittest2