diff --git a/tests/boto_tests/unit/__init__.py b/tests/boto_tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/boto_tests/test_credentials.py b/tests/boto_tests/unit/test_credentials.py
similarity index 99%
rename from tests/boto_tests/test_credentials.py
rename to tests/boto_tests/unit/test_credentials.py
index f71a420d..b5dc1ed9 100644
--- a/tests/boto_tests/test_credentials.py
+++ b/tests/boto_tests/unit/test_credentials.py
@@ -44,8 +44,7 @@
     AioSSOProvider,
 )
 from aiobotocore.session import AioSession
-
-from .helpers import StubbedSession
+from tests.boto_tests.helpers import StubbedSession
 
 
 def random_chars(num_chars):
diff --git a/tests/boto_tests/test_signers.py b/tests/boto_tests/unit/test_signers.py
similarity index 100%
rename from tests/boto_tests/test_signers.py
rename to tests/boto_tests/unit/test_signers.py
diff --git a/tests/boto_tests/test_utils.py b/tests/boto_tests/unit/test_utils.py
similarity index 100%
rename from tests/boto_tests/test_utils.py
rename to tests/boto_tests/unit/test_utils.py
diff --git a/tests/python3.8/boto_tests/unit/__init__.py b/tests/python3.8/boto_tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/python3.8/boto_tests/test_credentials.py b/tests/python3.8/boto_tests/unit/test_credentials.py
similarity index 99%
rename from tests/python3.8/boto_tests/test_credentials.py
rename to tests/python3.8/boto_tests/unit/test_credentials.py
index 2b1223ca..c2350b8a 100644
--- a/tests/python3.8/boto_tests/test_credentials.py
+++ b/tests/python3.8/boto_tests/unit/test_credentials.py
@@ -10,7 +10,7 @@
 
 from aiobotocore import credentials
 from aiobotocore.session import AioSession
-from tests.boto_tests.test_credentials import full_url
+from tests.boto_tests.unit.test_credentials import full_url
 
 
 # From class TestRefreshableCredentials(TestCredentials):
diff --git a/tests/python3.8/boto_tests/test_signers.py b/tests/python3.8/boto_tests/unit/test_signers.py
similarity index 100%
rename from tests/python3.8/boto_tests/test_signers.py
rename to tests/python3.8/boto_tests/unit/test_signers.py
diff --git a/tests/python3.8/boto_tests/test_tokens.py b/tests/python3.8/boto_tests/unit/test_tokens.py
similarity index 100%
rename from tests/python3.8/boto_tests/test_tokens.py
rename to tests/python3.8/boto_tests/unit/test_tokens.py
diff --git a/tests/python3.8/boto_tests/test_utils.py b/tests/python3.8/boto_tests/unit/test_utils.py
similarity index 99%
rename from tests/python3.8/boto_tests/test_utils.py
rename to tests/python3.8/boto_tests/unit/test_utils.py
index 934438dc..0318c23e 100644
--- a/tests/python3.8/boto_tests/test_utils.py
+++ b/tests/python3.8/boto_tests/unit/test_utils.py
@@ -13,7 +13,7 @@
 from aiobotocore import utils
 from aiobotocore.awsrequest import AioAWSResponse
 from aiobotocore.utils import AioInstanceMetadataFetcher
-from tests.boto_tests.test_utils import fake_aiohttp_session
+from tests.boto_tests.unit.test_utils import fake_aiohttp_session
 from tests.test_response import AsyncBytesIO