diff --git a/test/units/modules/cloud/amazon/test_api_gateway.py b/test/units/modules/cloud/amazon/test_aws_api_gateway.py
similarity index 100%
rename from test/units/modules/cloud/amazon/test_api_gateway.py
rename to test/units/modules/cloud/amazon/test_aws_api_gateway.py
diff --git a/test/units/modules/cloud/amazon/test_s3.py b/test/units/modules/cloud/amazon/test_aws_s3.py
similarity index 74%
rename from test/units/modules/cloud/amazon/test_s3.py
rename to test/units/modules/cloud/amazon/test_aws_s3.py
index 70966b2dc46..9b17502822c 100644
--- a/test/units/modules/cloud/amazon/test_s3.py
+++ b/test/units/modules/cloud/amazon/test_aws_s3.py
@@ -3,7 +3,7 @@ import pytest
 import unittest
 
 try:
-    import ansible.modules.cloud.amazon.s3 as s3
+    import ansible.modules.cloud.amazon.aws_s3 as s3
 except ImportError:
     pytestmark = pytest.mark.skip("This test requires the s3 Python libraries")
 
@@ -24,13 +24,6 @@ class TestUrlparse(unittest.TestCase):
         actual = s3.is_fakes3("fakes3://bla.blubb")
         self.assertEqual(True, actual)
 
-    def test_is_walrus(self):
-        actual = s3.is_walrus("trulywalrus_but_invalid_url")
-        # I don't know if this makes sense, but this is the current behaviour...
-        self.assertEqual(True, actual)
-        actual = s3.is_walrus("http://notwalrus.amazonaws.com")
-        self.assertEqual(False, actual)
-
     def test_get_s3_connection(self):
         aws_connect_kwargs = dict(aws_access_key_id="access_key",
                                   aws_secret_access_key="secret_key")