diff --git a/setup.py b/setup.py
index 377ef6f..d0dce03 100644
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@
     extras_require={
         'dev': ['check-manifest', 'icecream'],
         'test': ['mongomock>=3.22.1', 'pytest>=6.2.2', 'pytest-mock==3.5.1',
-                 'pytest-mongodb>=2.2.0', 'testfixtures>=6.17.1', 'moto>=4.0.0'],
+                 'pytest-mongodb>=2.2.0', 'testfixtures>=6.17.1', 'moto>=5.0.0'],
     },
 
     entry_points={
diff --git a/tests/core/conftest.py b/tests/core/conftest.py
index 3350036..fbcced3 100644
--- a/tests/core/conftest.py
+++ b/tests/core/conftest.py
@@ -5,7 +5,7 @@
 import boto3
 import io
 import gzip
-from moto import mock_s3
+from moto import mock_aws
 
 
 # Mock coverage file structure
@@ -78,7 +78,7 @@ def aws_credentials():
 
 @pytest.fixture(scope="session")
 def s3(aws_credentials):
-    with mock_s3():
+    with mock_aws():
         yield boto3.client("s3", region_name="atlantis")