diff --git a/tests/common_test_stuff.py b/tests/common_test_class.py
similarity index 93%
rename from tests/common_test_stuff.py
rename to tests/common_test_class.py
index b1950883..45263ec8 100644
--- a/tests/common_test_stuff.py
+++ b/tests/common_test_class.py
@@ -9,7 +9,7 @@ import pymongo.collection
 from flask.testing import FlaskClient
 import httpretty
 
-from test_data import EXAMPLE_PROJECT, EXAMPLE_FILE
+from common_test_data import EXAMPLE_PROJECT, EXAMPLE_FILE
 
 BLENDER_ID_ENDPOINT = 'http://127.0.0.1:8001'  # nonexistant server, no trailing slash!
 MY_PATH = os.path.dirname(os.path.abspath(__file__))
@@ -24,7 +24,7 @@ logging.basicConfig(
 
 class AbstractPillarTest(TestMinimal):
     def setUp(self, **kwargs):
-        settings_file = os.path.join(MY_PATH, 'test_settings.py')
+        settings_file = os.path.join(MY_PATH, 'common_test_settings.py')
         kwargs['settings_file'] = settings_file
         os.environ['EVE_SETTINGS'] = settings_file
         super(AbstractPillarTest, self).setUp(**kwargs)
@@ -46,7 +46,7 @@ class AbstractPillarTest(TestMinimal):
         # but also un-import the application.
         del sys.modules['application']
 
-    def _ensure_file_exists(self, file_overrides=None):
+    def ensure_file_exists(self, file_overrides=None):
         with self.app.test_request_context():
             files_collection = self.app.data.driver.db['files']
             projects_collection = self.app.data.driver.db['projects']
diff --git a/tests/test_data.py b/tests/common_test_data.py
similarity index 99%
rename from tests/test_data.py
rename to tests/common_test_data.py
index 27424ae1..b6f07d26 100644
--- a/tests/test_data.py
+++ b/tests/common_test_data.py
@@ -239,7 +239,7 @@ EXAMPLE_PROJECT = {
                                      u'is_tileable': {u'type': u'boolean'},
                                      u'order': {u'type': u'integer'},
                                      u'resolution': {u'type': u'string'},
-                                     u'status': {u'allowed': [u'published',
+                                     u'stat_ensure_file_existsus': {u'allowed': [u'published',
                                                               u'pending',
                                                               u'processing',
                                                               u'deleted'],
diff --git a/tests/test_settings.py b/tests/common_test_settings.py
similarity index 100%
rename from tests/test_settings.py
rename to tests/common_test_settings.py
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 392ee824..526d6704 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -1,7 +1,7 @@
 import base64
 import httpretty
 
-from common_test_stuff import AbstractPillarTest, TEST_EMAIL_USER, TEST_EMAIL_ADDRESS
+from common_test_class import AbstractPillarTest, TEST_EMAIL_USER, TEST_EMAIL_ADDRESS
 
 
 def make_header(username, password=''):
diff --git a/tests/test_file_caching.py b/tests/test_file_caching.py
index da0c0f0c..031b033e 100644
--- a/tests/test_file_caching.py
+++ b/tests/test_file_caching.py
@@ -4,7 +4,7 @@ import bson.tz_util
 import datetime
 from eve import RFC1123_DATE_FORMAT
 
-from common_test_stuff import AbstractPillarTest
+from common_test_class import AbstractPillarTest
 
 
 class FileCachingTest(AbstractPillarTest):
@@ -15,7 +15,7 @@ class FileCachingTest(AbstractPillarTest):
         self.assertEqual(404, resp.status_code)
 
     def test_existing_file(self):
-        file_id, _ = self._ensure_file_exists()
+        file_id, _ = self.ensure_file_exists()
 
         resp = self.client.get('/files/%s' % file_id)
         self.assertEqual(200, resp.status_code)
@@ -24,7 +24,7 @@ class FileCachingTest(AbstractPillarTest):
         with self.app.test_request_context():
             # Make sure the file link has not expired.
             expires = datetime.datetime.now(tz=bson.tz_util.utc) + datetime.timedelta(minutes=1)
-            file_id, file_doc = self._ensure_file_exists(file_overrides={
+            file_id, file_doc = self.ensure_file_exists(file_overrides={
                 u'link_expires': expires
             })
 
@@ -34,7 +34,7 @@ class FileCachingTest(AbstractPillarTest):
         self.assertEqual(304, resp.status_code)
 
     def test_if_modified_200(self):
-        file_id, file_doc = self._ensure_file_exists()
+        file_id, file_doc = self.ensure_file_exists()
 
         delta = datetime.timedelta(days=-1)
 
@@ -48,7 +48,7 @@ class FileCachingTest(AbstractPillarTest):
         with self.app.test_request_context():
             # Make sure the file link has expired.
             expires = datetime.datetime.now(tz=bson.tz_util.utc) - datetime.timedelta(seconds=1)
-            file_id, file_doc = self._ensure_file_exists(file_overrides={
+            file_id, file_doc = self.ensure_file_exists(file_overrides={
                 u'link_expires': expires
             })