diff --git a/tests/test_oauth2client_file.py b/tests/test_oauth2client_file.py
index 5ada4a3..4776404 100644
--- a/tests/test_oauth2client_file.py
+++ b/tests/test_oauth2client_file.py
@@ -23,10 +23,12 @@
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 
 import copy
+import datetime
+import httplib2
 import os
 import pickle
+import tempfile
 import unittest
-import datetime
 
 
 try:  # pragma: no cover
@@ -48,7 +50,7 @@
 from oauth2client import multistore_file
 
 
-FILENAME = os.path.join(os.path.dirname(__file__), 'test_file_storage.data')
+FILENAME = tempfile.mktemp('oauth2client_test.data')
 
 
 class OAuth2ClientFileTests(unittest.TestCase):
@@ -104,7 +106,7 @@
 
     self.assertEquals(data['access_token'], 'foo')
     self.assertEquals(data['_class'], 'OAuth2Credentials')
-    self.assertEquals(data['_module'], 'oauth2client.client')
+    self.assertEquals(data['_module'], OAuth2Credentials.__module__)
 
   def test_token_refresh(self):
     # Write a file with a pickled OAuth2Credentials.