diff --git a/apps/dc_tools/tests/test_sns_publishing.py b/apps/dc_tools/tests/test_sns_publishing.py
index d9a25a51..b456925a 100644
--- a/apps/dc_tools/tests/test_sns_publishing.py
+++ b/apps/dc_tools/tests/test_sns_publishing.py
@@ -3,7 +3,7 @@
 import os
 import pytest
 from click.testing import CliRunner
-from moto import mock_sns, mock_sqs
+from moto import mock_aws
 from pathlib import Path
 
 from odc.apps.dc_tools.fs_to_dc import cli as fs_cli
@@ -27,7 +27,7 @@ def sns_setup(aws_credentials, aws_env):
     Tests are structured as follows:
     input: [ STAC -> SNS -> SQS ] -> dc_tools -> output: [ STAC -> SNS -> SQS ]
     """
-    with mock_sqs(), mock_sns():
+    with mock_aws():
         sns = boto3.client("sns")
         sqs = boto3.client("sqs")
 
diff --git a/apps/dc_tools/tests/test_sqs_to_dc.py b/apps/dc_tools/tests/test_sqs_to_dc.py
index 58188dce..20423033 100644
--- a/apps/dc_tools/tests/test_sqs_to_dc.py
+++ b/apps/dc_tools/tests/test_sqs_to_dc.py
@@ -8,7 +8,7 @@
 import pytest
 from deepdiff import DeepDiff
 from functools import partial
-from moto import mock_sqs
+from moto import mock_aws
 from odc.aws.queue import get_messages
 from pathlib import Path
 from pprint import pformat
@@ -98,7 +98,7 @@ def aws_credentials():
     os.environ["AWS_SESSION_TOKEN"] = "testing"
 
 
-@mock_sqs
+@mock_aws
 def test_extract_metadata_from_message(aws_credentials, odc_test_db_with_products):
     TEST_QUEUE_NAME = "a_test_queue"
     sqs_resource = boto3.resource("sqs")
diff --git a/libs/cloud/tests/test_aws.py b/libs/cloud/tests/test_aws.py
index 48fad925..da5d77d1 100644
--- a/libs/cloud/tests/test_aws.py
+++ b/libs/cloud/tests/test_aws.py
@@ -3,7 +3,7 @@
 import os
 import pytest
 from click.testing import CliRunner
-from moto import mock_sqs
+from moto import mock_aws
 from odc.aws._find import parse_query
 from odc.aws.queue import get_queue, get_queues, redrive_queue
 from types import SimpleNamespace
@@ -24,7 +24,7 @@ def aws_env(monkeypatch):
         monkeypatch.setenv("AWS_DEFAULT_REGION", "us-west-2")
 
 
-@mock_sqs
+@mock_aws
 def test_redrive_to_queue(aws_env):
     resource = boto3.resource("sqs")
 
@@ -66,7 +66,7 @@ def test_redrive_to_queue(aws_env):
     assert get_n_messages(dead_queue) == 0
 
 
-@mock_sqs
+@mock_aws
 def test_redrive_to_queue_cli(aws_env):
     resource = boto3.resource("sqs")
 
@@ -127,7 +127,7 @@ def test_redrive_to_queue_cli(aws_env):
     )
 
 
-@mock_sqs
+@mock_aws
 def test_get_queues(aws_env):
     resource = boto3.resource("sqs")
 
@@ -169,7 +169,7 @@ def test_get_queues(aws_env):
     assert len(list(queues)) == 0
 
 
-@mock_sqs
+@mock_aws
 def test_get_queues_empty(aws_env):
     queues = get_queues()