diff --git a/data/model/test/test_repository.py b/data/model/test/test_repository.py
index f15f6236d..76308142e 100644
--- a/data/model/test/test_repository.py
+++ b/data/model/test/test_repository.py
@@ -2,8 +2,8 @@ import pytest
 
 from peewee import IntegrityError
 
-from endpoints.test.fixtures import database_uri, init_db_path, sqlitedb_file
 from data.model.repository import create_repository
+from test.fixtures import database_uri, init_db_path, sqlitedb_file
 
 def test_duplicate_repository_different_kinds(database_uri):
   # Create an image repo.
diff --git a/endpoints/api/test/test_disallow_for_apps.py b/endpoints/api/test/test_disallow_for_apps.py
index a9e3b4d00..23f101425 100644
--- a/endpoints/api/test/test_disallow_for_apps.py
+++ b/endpoints/api/test/test_disallow_for_apps.py
@@ -16,7 +16,7 @@ from endpoints.api.trigger import (BuildTriggerList, BuildTrigger, BuildTriggerS
                                    TriggerBuildList, BuildTriggerFieldValues, BuildTriggerSources,
                                    BuildTriggerSourceNamespaces)
 from endpoints.api.test.shared import client_with_identity, conduct_api_call
-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
 
 BUILD_ARGS = {'build_uuid': '1234'}
 IMAGE_ARGS = {'imageid': '1234', 'image_id': 1234}
diff --git a/endpoints/appr/registry.py b/endpoints/appr/registry.py
index 701c74ffd..e0f41af51 100644
--- a/endpoints/appr/registry.py
+++ b/endpoints/appr/registry.py
@@ -12,8 +12,8 @@ from cnr.exception import (CnrException, InvalidUsage, InvalidParams, InvalidRel
 from flask import request, jsonify
 
 from app import authentication
-from auth.process import process_auth
 from auth.auth_context import get_authenticated_user
+from auth.decorators import process_auth
 from auth.permissions import CreateRepositoryPermission, ModifyRepositoryPermission
 from endpoints.appr import appr_bp, require_app_repo_read, require_app_repo_write
 from endpoints.appr.decorators import disallow_for_image_repository
diff --git a/endpoints/appr/test/test_api_security.py b/endpoints/appr/test/test_api_security.py
index ea7e11dee..6e60cdb1e 100644
--- a/endpoints/appr/test/test_api_security.py
+++ b/endpoints/appr/test/test_api_security.py
@@ -4,9 +4,9 @@ import pytest
 from flask import url_for
 
 from data import model
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from endpoints.appr.registry import appr_bp, blobs
 from endpoints.api.test.shared import client_with_identity
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 @pytest.mark.parametrize('resource,method,params,owned_by,identity,expected', [
   ('appr.blobs', 'GET', {'digest': 'abcd1235'}, 'devtable', 'public', 401),
diff --git a/endpoints/appr/test/test_decorators.py b/endpoints/appr/test/test_appr_decorators.py
similarity index 82%
rename from endpoints/appr/test/test_decorators.py
rename to endpoints/appr/test/test_appr_decorators.py
index 0e5565da3..fee7ea7cb 100644
--- a/endpoints/appr/test/test_decorators.py
+++ b/endpoints/appr/test/test_appr_decorators.py
@@ -3,8 +3,8 @@ import pytest
 from werkzeug.exceptions import NotImplemented as NIE
 
 from data import model
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from endpoints.appr import require_app_repo_read
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 def test_require_app_repo_read(app):
   called = [False]
diff --git a/endpoints/appr/test/test_registry.py b/endpoints/appr/test/test_registry.py
index 50a5bdc64..bb945246b 100644
--- a/endpoints/appr/test/test_registry.py
+++ b/endpoints/appr/test/test_registry.py
@@ -1,11 +1,10 @@
 import json
-import pytest
 
 from flask import url_for
 
 from data import model
-from endpoints.test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 from endpoints.appr.registry import appr_bp
+from test.fixtures import app, appconfig, database_uri, init_db_path, sqlitedb_file
 
 def test_invalid_login(app, client):
   app.register_blueprint(appr_bp, url_prefix='/cnr')