diff --git a/setup.cfg b/setup.cfg
index 004a4a6b23e5..731d81393f55 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,14 +1,14 @@
-[wheel]
+[bdist_wheel]
 universal = 0
 
-[metadata]
-requires_dist =
-        botocore==1.43.49
-        docutils>=0.18.1,<=0.19
-        s3transfer>=0.19.0,<0.20.0
-        PyYAML>=3.10,<6.1
-        colorama>=0.2.5,<0.4.7
-        rsa>=3.1.2,<4.8
+[options]
+install_requires =
+    botocore==1.43.49
+    docutils>=0.18.1,<=0.19
+    s3transfer>=0.19.0,<0.20.0
+    PyYAML>=3.10,<6.1
+    colorama>=0.2.5,<0.4.7
+    rsa>=3.1.2,<4.8
 
 [check-manifest]
 ignore =
@@ -28,4 +28,4 @@ ignore =
     scripts
     scripts/*
     doc
-    doc/*
+    doc/*
\ No newline at end of file
diff --git a/setup.py b/setup.py
index e2e9abc3d1d3..81cb0ad823aa 100644
--- a/setup.py
+++ b/setup.py
@@ -16,8 +16,8 @@ def read(*parts):
 
 def find_version(*file_paths):
     version_file = read(*file_paths)
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
+    version_match = re.search(r"^__version__\s*=\s*['\"]([^'\"]*)['\"]",
+                          version_file, re.M)
     if version_match:
         return version_match.group(1)
     raise RuntimeError("Unable to find version string.")
@@ -81,8 +81,8 @@ def find_version(*file_paths):
             'optimize': 0,
             'skip_archive': True,
             'dll_excludes': ['crypt32.dll'],
-            'packages': ['docutils', 'urllib', 'httplib', 'HTMLParser',
-                         'awscli', 'ConfigParser', 'xml.etree', 'pipes'],
+            'packages': ['docutils', 'urllib', 'http.client', 'html.parser',
+                         'awscli', 'configparser', 'xml.etree', 'pipes'],
         }
     }
     setup_options['console'] = ['bin/aws']
diff --git a/tests/__init__.py b/tests/__init__.py
index 4bfba60a8499..7ebed6c74c06 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -277,7 +277,7 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
 
-# CaseInsensitiveDict from requests that must be serializble.
+# CaseInsensitiveDict from requests that must be serializable.
 class CaseInsensitiveDict(collections_abc.MutableMapping):
     def __init__(self, data=None, **kwargs):
         self._store = dict()
@@ -320,7 +320,7 @@ def __eq__(self, other):
 
     # Copy is required
     def copy(self):
-        return CaseInsensitiveDict(self._store.values())
+        return CaseInsensitiveDict(dict(self._store.values()))
 
     def __repr__(self):
         return str(dict(self.items()))