diff --git a/endpoints/api/test/test_security.py b/endpoints/api/test/test_security.py
index e14051a23..7d094f44c 100644
--- a/endpoints/api/test/test_security.py
+++ b/endpoints/api/test/test_security.py
@@ -3,7 +3,7 @@ import pytest
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
 from endpoints.api.superuser import SuperUserRepositoryBuildLogs, SuperUserRepositoryBuildResource
 from endpoints.api.superuser import SuperUserRepositoryBuildStatus
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 TEAM_PARAMS = {'orgname': 'buynlarge', 'teamname': 'owners'}
 BUILD_PARAMS = {'build_uuid': 'test-1234'}
diff --git a/endpoints/oauth/test/test_login.py b/endpoints/oauth/test/test_login.py
index 5d97d5955..04b510aef 100644
--- a/endpoints/oauth/test/test_login.py
+++ b/endpoints/oauth/test/test_login.py
@@ -1,12 +1,12 @@
 import pytest
 
 from endpoints.oauth.login import _conduct_oauth_login
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 from oauth.services.github import GithubOAuthService
 
 from data import model, database
 from data.users import get_users_handler, DatabaseUsers
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from test.test_ldap import mock_ldap
 
 
diff --git a/endpoints/test/__init__.py b/endpoints/test/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/endpoints/test/test_notificationevent.py b/endpoints/test/test_notificationevent.py
index 65497f20c..465589e7f 100644
--- a/endpoints/test/test_notificationevent.py
+++ b/endpoints/test/test_notificationevent.py
@@ -1,7 +1,7 @@
 import json
 
 from endpoints.notificationevent import NotificationEvent
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 from util.morecollections import AttrDict
 
diff --git a/endpoints/test/fixtures.py b/test/fixtures.py
similarity index 100%
rename from endpoints/test/fixtures.py
rename to test/fixtures.py