diff --git a/test/test_api_usage.py b/test/test_api_usage.py
index 0caa03cb8..8a673175a 100644
--- a/test/test_api_usage.py
+++ b/test/test_api_usage.py
@@ -78,7 +78,7 @@ from endpoints.api.secscan import RepositoryImageSecurity, RepositoryManifestSec
 from endpoints.api.suconfig import (
   SuperUserRegistryStatus, SuperUserConfig, SuperUserConfigFile, SuperUserCreateInitialSuperUser)
 from endpoints.api.manifest import RepositoryManifestLabels, ManageRepositoryManifestLabel
-from test.test_ssl_util import generate_test_cert
+from util.security.test.test_ssl_util import generate_test_cert
 from util.morecollections import AttrDict
 
 try:
diff --git a/util/config/validators/test/test_validate_ssl.py b/util/config/validators/test/test_validate_ssl.py
index 8ea7f3297..470a25566 100644
--- a/util/config/validators/test/test_validate_ssl.py
+++ b/util/config/validators/test/test_validate_ssl.py
@@ -6,7 +6,7 @@ from tempfile import NamedTemporaryFile
 from util.config.validator import ValidatorContext
 from util.config.validators import ConfigValidationException
 from util.config.validators.validate_ssl import SSLValidator, SSL_FILENAMES
-from test.test_ssl_util import generate_test_cert
+from util.security.test.test_ssl_util import generate_test_cert
 
 from test.fixtures import *
 from app import config_provider
diff --git a/util/security/test/__init__.py b/util/security/test/__init__.py
new file mode 100644
index 000000000..e69de29bb