diff --git a/modules/terraform-aws-ca-lambda/.pylintrc b/modules/terraform-aws-ca-lambda/.pylintrc
deleted file mode 100644
index 530e1e3e..00000000
--- a/modules/terraform-aws-ca-lambda/.pylintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[MESSAGES CONTROL]
-  disable=
-    django-not-available
\ No newline at end of file
diff --git a/modules/terraform-aws-ca-lambda/unittests/__init__.py b/modules/terraform-aws-ca-lambda/unittests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/terraform-aws-ca-lambda/lambda_code/tls_cert/test_tls_cert.py b/modules/terraform-aws-ca-lambda/unittests/test_tls_cert.py
similarity index 96%
rename from modules/terraform-aws-ca-lambda/lambda_code/tls_cert/test_tls_cert.py
rename to modules/terraform-aws-ca-lambda/unittests/test_tls_cert.py
index eff928f0..048913fb 100644
--- a/modules/terraform-aws-ca-lambda/lambda_code/tls_cert/test_tls_cert.py
+++ b/modules/terraform-aws-ca-lambda/unittests/test_tls_cert.py
@@ -1,4 +1,10 @@
-from .tls_cert import create_csr_info, create_csr_subject, CaChainResponse, CertificateResponse, Request
+from lambda_code.tls_cert.tls_cert import (
+    create_csr_info,
+    create_csr_subject,
+    CaChainResponse,
+    CertificateResponse,
+    Request,
+)
 
 
 def test_create_csr_info():
diff --git a/modules/terraform-aws-ca-lambda/utils/certs/test_types.py b/modules/terraform-aws-ca-lambda/unittests/test_types.py
similarity index 98%
rename from modules/terraform-aws-ca-lambda/utils/certs/test_types.py
rename to modules/terraform-aws-ca-lambda/unittests/test_types.py
index 2c2c9d71..e1f81e99 100644
--- a/modules/terraform-aws-ca-lambda/utils/certs/test_types.py
+++ b/modules/terraform-aws-ca-lambda/unittests/test_types.py
@@ -1,6 +1,6 @@
 from cryptography.x509.oid import NameOID
 
-from .types import CsrInfo, Subject
+from utils.certs.types import CsrInfo, Subject
 
 
 # test defaults