diff --git a/tests/unit/botocore/response_parsing/test_response_parsing.py b/tests/unit/botocore/response_parsing/test_response_parsing.py
index 63376e626cd2..e8a8b4f8707d 100644
--- a/tests/unit/botocore/response_parsing/test_response_parsing.py
+++ b/tests/unit/botocore/response_parsing/test_response_parsing.py
@@ -28,8 +28,6 @@
 
 
 SPECIAL_CASES = [
-    'iam-get-user-policy.xml',  # Needs the JSON decode from handlers.py
-    'iam-list-roles.xml',  # Needs the JSON decode from handlers.py for the policy
     's3-get-bucket-location.xml',  # Confirmed, this will need a special handler
     #'s3-list-multipart-uploads.xml',  # Bug in model, missing delimeter
     'cloudformation-get-template.xml',  # Need to JSON decode the template body.
diff --git a/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.json b/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.json
deleted file mode 100644
index 6a1d222b4b67..000000000000
--- a/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "Error": {
-        "Code": "NoSuchEntity",
-        "Message": "The user with name foobar cannot be found.",
-        "Type": "Sender"
-    },
-    "ResponseMetadata": {
-        "RequestId": "358299bb-b7f8-11e2-8d39-e3a125f625ee"
-    }
-}
diff --git a/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.xml b/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.xml
deleted file mode 100644
index 4f12a99c8bea..000000000000
--- a/tests/unit/botocore/response_parsing/xml/errors/iam-get-user.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ErrorResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <Error>
-    <Type>Sender</Type>
-    <Code>NoSuchEntity</Code>
-    <Message>The user with name foobar cannot be found.</Message>
-  </Error>
-  <RequestId>358299bb-b7f8-11e2-8d39-e3a125f625ee</RequestId>
-</ErrorResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.json b/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.json
deleted file mode 100644
index a4ebae2c3f2b..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "ResponseMetadata": {
-        "RequestId": "c7bf48a5-d35c-11e2-b096-29dca78bf3ce"
-    }, 
-    "VirtualMFADevice": {
-        "Base32StringSeed": "U3IWOL56EJ3Q5ILYBLU6NLTNZR3V5SAOWKQ5AOEPEQUUGQJFVDQKOA2N7OANTHBR", 
-        "SerialNumber": "arn:aws:iam::419278470775:mfa/ExampleMFADevice", 
-        "QRCodePNG": "foo"
-    }
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.xml
deleted file mode 100644
index 1466f5ce9cee..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-create-virtual-mfa-device.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<CreateVirtualMFADeviceResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <CreateVirtualMFADeviceResult>
-    <VirtualMFADevice>
-      <QRCodePNG>Zm9v</QRCodePNG>
-      <Base32StringSeed>VTNJV09MNTZFSjNRNUlMWUJMVTZOTFROWlIzVjVTQU9XS1E1QU9FUEVRVVVHUUpGVkRRS09BMk43T0FOVEhCUg==</Base32StringSeed>
-      <SerialNumber>arn:aws:iam::419278470775:mfa/ExampleMFADevice</SerialNumber>
-    </VirtualMFADevice>
-  </CreateVirtualMFADeviceResult>
-  <ResponseMetadata>
-    <RequestId>c7bf48a5-d35c-11e2-b096-29dca78bf3ce</RequestId>
-  </ResponseMetadata>
-</CreateVirtualMFADeviceResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.json b/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.json
deleted file mode 100644
index 8d808d26c62c..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "SummaryMap": {
-        "AccessKeysPerUserQuota": 2, 
-        "AssumeRolePolicySizeQuota": 2048, 
-        "UsersQuota": 5000, 
-        "GroupsPerUserQuota": 10, 
-        "Users": 1, 
-        "Roles": 0, 
-        "MFADevices": 0, 
-        "InstanceProfilesQuota": 100, 
-        "AccountMFAEnabled": 0, 
-        "ServerCertificates": 0, 
-        "UserPolicySizeQuota": 2048, 
-        "RolePolicySizeQuota": 10240, 
-        "MFADevicesInUse": 0, 
-        "GroupsQuota": 100, 
-        "Groups": 0, 
-        "InstanceProfiles": 0, 
-        "GroupPolicySizeQuota": 5120, 
-        "SigningCertificatesPerUserQuota": 2, 
-        "ServerCertificatesQuota": 10, 
-        "RolesQuota": 250
-    }, 
-    "ResponseMetadata": {
-        "RequestId": "a8e3b3ed-9167-11e2-8a19-1174a5b297de"
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.xml
deleted file mode 100644
index e5b0a957b552..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-account-summary.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<GetAccountSummaryResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <GetAccountSummaryResult>
-    <SummaryMap>
-      <entry>
-        <key>Users</key>
-        <value>1</value>
-      </entry>
-      <entry>
-        <key>GroupsQuota</key>
-        <value>100</value>
-      </entry>
-      <entry>
-        <key>RolesQuota</key>
-        <value>250</value>
-      </entry>
-      <entry>
-        <key>GroupPolicySizeQuota</key>
-        <value>5120</value>
-      </entry>
-      <entry>
-        <key>ServerCertificates</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>ServerCertificatesQuota</key>
-        <value>10</value>
-      </entry>
-      <entry>
-        <key>Groups</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>MFADevicesInUse</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>UsersQuota</key>
-        <value>5000</value>
-      </entry>
-      <entry>
-        <key>AccountMFAEnabled</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>InstanceProfilesQuota</key>
-        <value>100</value>
-      </entry>
-      <entry>
-        <key>MFADevices</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>AccessKeysPerUserQuota</key>
-        <value>2</value>
-      </entry>
-      <entry>
-        <key>RolePolicySizeQuota</key>
-        <value>10240</value>
-      </entry>
-      <entry>
-        <key>UserPolicySizeQuota</key>
-        <value>2048</value>
-      </entry>
-      <entry>
-        <key>GroupsPerUserQuota</key>
-        <value>10</value>
-      </entry>
-      <entry>
-        <key>SigningCertificatesPerUserQuota</key>
-        <value>2</value>
-      </entry>
-      <entry>
-        <key>AssumeRolePolicySizeQuota</key>
-        <value>2048</value>
-      </entry>
-      <entry>
-        <key>InstanceProfiles</key>
-        <value>0</value>
-      </entry>
-      <entry>
-        <key>Roles</key>
-        <value>0</value>
-      </entry>
-    </SummaryMap>
-  </GetAccountSummaryResult>
-  <ResponseMetadata>
-    <RequestId>a8e3b3ed-9167-11e2-8a19-1174a5b297de</RequestId>
-  </ResponseMetadata>
-</GetAccountSummaryResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.json b/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.json
deleted file mode 100644
index 4ce25e3c8135..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "Group": {
-        "Path": "/", 
-        "CreateDate": "2013-06-04T13:19:26Z", 
-        "GroupId": "AGPAIX2UU43C4MKIJO6OE", 
-        "Arn": "arn:aws:iam::419278470775:group/test_admin", 
-        "GroupName": "test_admin"
-    }, 
-    "Users": [
-        {
-            "UserName": "harry", 
-            "Path": "/", 
-            "CreateDate": "2013-06-04T13:20:49Z", 
-            "UserId": "AIDAIWOYUHHXRAGTJC6H2", 
-            "Arn": "arn:aws:iam::419278470775:user/harry"
-        }
-    ], 
-    "ResponseMetadata": {
-        "RequestId": "b23a1f90-d364-11e2-9e37-0baaf58cf1ee"
-    }, 
-    "IsTruncated": false
-}
\ No newline at end of file
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.xml
deleted file mode 100644
index ae10da0a6301..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-group.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<GetGroupResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <GetGroupResult>
-    <Users>
-      <member>
-        <UserId>AIDAIWOYUHHXRAGTJC6H2</UserId>
-        <Path>/</Path>
-        <UserName>harry</UserName>
-        <Arn>arn:aws:iam::419278470775:user/harry</Arn>
-        <CreateDate>2013-06-04T13:20:49Z</CreateDate>
-      </member>
-    </Users>
-    <IsTruncated>false</IsTruncated>
-    <Group>
-      <GroupId>AGPAIX2UU43C4MKIJO6OE</GroupId>
-      <GroupName>test_admin</GroupName>
-      <Path>/</Path>
-      <Arn>arn:aws:iam::419278470775:group/test_admin</Arn>
-      <CreateDate>2013-06-04T13:19:26Z</CreateDate>
-    </Group>
-  </GetGroupResult>
-  <ResponseMetadata>
-    <RequestId>b23a1f90-d364-11e2-9e37-0baaf58cf1ee</RequestId>
-  </ResponseMetadata>
-</GetGroupResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.json b/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.json
deleted file mode 100644
index f898462315bd..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "UserName": "test", 
-    "PolicyName": "test", 
-    "PolicyDocument": {
-        "Statement": [
-            {
-                "Action": [
-                    "ec2:CreateSnapshot", 
-                    "ec2:DescribeInstances", 
-                    "ec2:DescribeVolumes"
-                ], 
-                "Resource": "*", 
-                "Effect": "Allow", 
-                "Sid": "Stmt1331504410389"
-            }
-        ]
-    }, 
-    "ResponseMetadata": {
-        "RequestId": "5a2702d5-bcfd-11e2-b2db-2f18d5db5f10"
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.xml
deleted file mode 100644
index e7c688d846d7..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user-policy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<GetUserPolicyResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <GetUserPolicyResult>
-    <PolicyName>test</PolicyName>
-    <UserName>test</UserName>
-    <PolicyDocument>%7B%0A%20%20%22Statement%22%3A%20%5B%0A%20%20%20%20%7B%0A%20%20%20%20%20%20%22Sid%22%3A%20%22Stmt1331504410389%22%2C%0A%20%20%20%20%20%20%22Action%22%3A%20%5B%0A%20%20%20%20%20%20%20%20%22ec2%3ACreateSnapshot%22%2C%0A%20%20%20%20%20%20%20%20%22ec2%3ADescribeInstances%22%2C%0A%20%20%20%20%20%20%20%20%22ec2%3ADescribeVolumes%22%0A%20%20%20%20%20%20%5D%2C%0A%20%20%20%20%20%20%22Effect%22%3A%20%22Allow%22%2C%0A%20%20%20%20%20%20%22Resource%22%3A%20%22%2A%22%0A%20%20%20%20%7D%0A%20%20%5D%0A%7D</PolicyDocument>
-  </GetUserPolicyResult>
-  <ResponseMetadata>
-    <RequestId>5a2702d5-bcfd-11e2-b2db-2f18d5db5f10</RequestId>
-  </ResponseMetadata>
-</GetUserPolicyResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.json b/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.json
deleted file mode 100644
index 4ac184443fb5..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "User": {
-        "CreateDate": "2011-12-19T23:16:46Z",
-        "UserId": "123456789012",
-        "Arn": "arn:aws:iam::123456789012:root"
-    },
-    "ResponseMetadata": {
-        "RequestId": "a8ca5eb9-9167-11e2-8395-2fafede00095"
-    }
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.xml
deleted file mode 100644
index a1875d68e123..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-get-user.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<GetUserResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <GetUserResult>
-    <User>
-      <UserId>123456789012</UserId>
-      <Arn>arn:aws:iam::123456789012:root</Arn>
-      <CreateDate>2011-12-19T23:16:46Z</CreateDate>
-    </User>
-  </GetUserResult>
-  <ResponseMetadata>
-    <RequestId>a8ca5eb9-9167-11e2-8395-2fafede00095</RequestId>
-  </ResponseMetadata>
-</GetUserResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.json
deleted file mode 100644
index f30499eaeabe..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"AccessKeyMetadata": [{"AccessKeyId": "AKIAIOSFODNN7EXAMPLE",
-                         "Status": "Active",
-                         "UserName": "Bob"},
-                        {"AccessKeyId": "AKIAI44QH8DHBEXAMPLE",
-                         "Status": "Inactive",
-                         "UserName": "Bob"}],
- "IsTruncated": false,
- "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"}}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.xml
deleted file mode 100644
index 4c8b4c6b6fa6..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-access-keys.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<ListAccessKeysResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListAccessKeysResult>
-    <UserName>Bob</UserName>
-    <AccessKeyMetadata>
-      <member>
-        <UserName>Bob</UserName>
-        <AccessKeyId>AKIAIOSFODNN7EXAMPLE</AccessKeyId>
-        <Status>Active</Status>
-      </member>
-      <member>
-        <UserName>Bob</UserName>
-        <AccessKeyId>AKIAI44QH8DHBEXAMPLE</AccessKeyId>
-        <Status>Inactive</Status>
-      </member>
-    </AccessKeyMetadata>
-    <IsTruncated>false</IsTruncated>
-  </ListAccessKeysResult>
-  <ResponseMetadata>
-    <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-  </ResponseMetadata>
-</ListAccessKeysResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.json
deleted file mode 100644
index 422c30bad6c6..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"AccountAliases": ["foocorporation"],
- "IsTruncated": false,
- "ResponseMetadata":
- {"RequestId": "c5a076e9-f1b0-11df-8fbe-45274EXAMPLE"}
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.xml
deleted file mode 100644
index 9df2d2cd7336..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-account-aliases.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<ListAccountAliasesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListAccountAliasesResult>
-    <IsTruncated>false</IsTruncated>
-    <AccountAliases>
-      <member>foocorporation</member>
-    </AccountAliases>
-  </ListAccountAliasesResult>
-  <ResponseMetadata>
-    <RequestId>c5a076e9-f1b0-11df-8fbe-45274EXAMPLE</RequestId>
-  </ResponseMetadata>
-</ListAccountAliasesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.json
deleted file mode 100644
index c0de9c56b802..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"Groups": [
-    {"Arn": "arn:aws:iam::123456789012:group/Admins",
-     "GroupId": "AGPACKCEVSQ6C2EXAMPLE",
-     "GroupName": "Admins",
-     "Path": "/division_abc/subdivision_xyz/"},
-    {"Arn": "arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/product_1234/engineering/Test",
-     "GroupId": "AGP2MAB8DPLSRHEXAMPLE",
-     "GroupName": "Test",
-     "Path": "/division_abc/subdivision_xyz/product_1234/engineering/"},
-    {"Arn": "arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/product_1234/Managers",
-     "GroupId": "AGPIODR4TAW7CSEXAMPLE",
-     "GroupName": "Managers",
-     "Path": "/division_abc/subdivision_xyz/product_1234/"}],
- "IsTruncated": false,
- "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"}
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.xml
deleted file mode 100644
index ca8717aeb263..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-groups.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<ListGroupsResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-   <ListGroupsResult>
-      <Groups>
-         <member>
-            <Path>/division_abc/subdivision_xyz/</Path>
-            <GroupName>Admins</GroupName>
-            <GroupId>AGPACKCEVSQ6C2EXAMPLE</GroupId>
-            <Arn>arn:aws:iam::123456789012:group/Admins</Arn>
-         </member>
-         <member>
-            <Path>/division_abc/subdivision_xyz/product_1234/engineering/</Path>
-            <GroupName>Test</GroupName>
-            <GroupId>AGP2MAB8DPLSRHEXAMPLE</GroupId>
-            <Arn>arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/product_1234/engineering/Test</Arn>
-         </member>
-         <member>
-            <Path>/division_abc/subdivision_xyz/product_1234/</Path>
-            <GroupName>Managers</GroupName>
-            <GroupId>AGPIODR4TAW7CSEXAMPLE</GroupId>
-            <Arn>arn:aws:iam::123456789012:group/division_abc/subdivision_xyz/product_1234/Managers</Arn>
-         </member>
-      </Groups>
-      <IsTruncated>false</IsTruncated>
-   </ListGroupsResult>
-   <ResponseMetadata>
-      <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-   </ResponseMetadata>
-</ListGroupsResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.json
deleted file mode 100644
index 42b6f880764d..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{"InstanceProfiles": [
-    {"Arn": "arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database",
-     "CreateDate": "2012-05-09T16:27:03Z",
-     "InstanceProfileName": "Database",
-     "Path": "/application_abc/component_xyz/",
-     "Roles": []},
-    {"Arn": "arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver",
-     "CreateDate": "2012-05-09T16:27:11Z",
-     "InstanceProfileName": "Webserver",
-     "Path": "/application_abc/component_xyz/",
-     "Roles": []}],
- "IsTruncated": false,
- "ResponseMetadata": {"RequestId": "fd74fa8d-99f3-11e1-a4c3-27EXAMPLE804"}
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.xml
deleted file mode 100644
index c624cd972d55..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-instance-profiles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<ListInstanceProfilesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListInstanceProfilesResult>
-    <IsTruncated>false</IsTruncated>
-    <InstanceProfiles>
-      <member>
-        <Id>AIPACIFN4OZXG7EXAMPLE</Id>
-        <Roles/>
-        <InstanceProfileName>Database</InstanceProfileName>
-        <Path>/application_abc/component_xyz/</Path>
-        <Arn>arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Database</Arn>
-        <CreateDate>2012-05-09T16:27:03Z</CreateDate>
-      </member>
-      <member>
-        <Id>AIPACZLSXM2EYYEXAMPLE</Id>
-        <Roles/>
-        <InstanceProfileName>Webserver</InstanceProfileName>
-        <Path>/application_abc/component_xyz/</Path>
-        <Arn>arn:aws:iam::123456789012:instance-profile/application_abc/component_xyz/Webserver</Arn>
-        <CreateDate>2012-05-09T16:27:11Z</CreateDate>
-      </member>
-    </InstanceProfiles>
-  </ListInstanceProfilesResult>
-  <ResponseMetadata>
-    <RequestId>fd74fa8d-99f3-11e1-a4c3-27EXAMPLE804</RequestId>
-  </ResponseMetadata>
-</ListInstanceProfilesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.json
deleted file mode 100644
index f14cb5900ea7..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"IsTruncated": false,
- "MFADevices": [
-     {"SerialNumber": "R1234", "UserName": "Bob"}
- ],
- "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"}
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.xml
deleted file mode 100644
index 75ae00e2e3ce..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-mfa-devices.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<ListMFADevicesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-   <ListMFADevicesResult>
-      <MFADevices>
-         <member>
-            <UserName>Bob</UserName>
-            <SerialNumber>R1234</SerialNumber>
-         </member>
-      </MFADevices>
-      <IsTruncated>false</IsTruncated>
-   </ListMFADevicesResult>
-   <ResponseMetadata>
-      <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-   </ResponseMetadata>
-</ListMFADevicesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.json
deleted file mode 100644
index ec9fc1374120..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "ResponseMetadata": {
-        "RequestId": "20f7279f-99ee-11e1-a4c3-27EXAMPLE804"
-    }, 
-    "IsTruncated": false, 
-    "Roles": [
-        {
-            "AssumeRolePolicyDocument": {
-                "Version": "2008-10-17", 
-                "Statement": [
-                    {
-                        "Action": [
-                            "sts:AssumeRole"
-                        ], 
-                        "Effect": "Allow", 
-                        "Principal": {
-                            "Service": [
-                                "ec2.amazonaws.com"
-                            ]
-                        }
-                    }
-                ]
-            }, 
-            "RoleId": "AROACVSVTSZYEXAMPLEYK", 
-            "CreateDate": "2012-05-09T15:45:35Z", 
-            "RoleName": "S3Access", 
-            "Path": "/application_abc/component_xyz/", 
-            "Arn": "arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access"
-        }, 
-        {
-            "AssumeRolePolicyDocument": {
-                "Version": "2008-10-17", 
-                "Statement": [
-                    {
-                        "Action": [
-                            "sts:AssumeRole"
-                        ], 
-                        "Effect": "Allow", 
-                        "Principal": {
-                            "Service": [
-                                "ec2.amazonaws.com"
-                            ]
-                        }
-                    }
-                ]
-            }, 
-            "RoleId": "AROAC2ICXG32EXAMPLEWK", 
-            "CreateDate": "2012-05-09T15:45:45Z", 
-            "RoleName": "SDBAccess", 
-            "Path": "/application_abc/component_xyz/", 
-            "Arn": "arn:aws:iam::123456789012:role/application_abc/component_xyz/SDBAccess"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.xml
deleted file mode 100644
index 5ee1e78d042a..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-roles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<ListRolesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListRolesResult>
-    <IsTruncated>false</IsTruncated>
-    <Roles>
-      <member>
-        <Path>/application_abc/component_xyz/</Path>
-        <Arn>arn:aws:iam::123456789012:role/application_abc/component_xyz/S3Access</Arn>
-        <RoleName>S3Access</RoleName>
-        <AssumeRolePolicyDocument>%7B%22Version%22%3A%222008-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22Service%22%3A%5B%22ec2.amazonaws.com%22%5D%7D%2C%22Action%22%3A%5B%22sts%3AAssumeRole%22%5D%7D%5D%7D</AssumeRolePolicyDocument>
-        <CreateDate>2012-05-09T15:45:35Z</CreateDate>
-        <RoleId>AROACVSVTSZYEXAMPLEYK</RoleId>
-      </member>
-      <member>
-        <Path>/application_abc/component_xyz/</Path>
-        <Arn>arn:aws:iam::123456789012:role/application_abc/component_xyz/SDBAccess</Arn>
-        <RoleName>SDBAccess</RoleName>
-        <AssumeRolePolicyDocument>%7B%22Version%22%3A%222008-10-17%22%2C%22Statement%22%3A%5B%7B%22Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22Service%22%3A%5B%22ec2.amazonaws.com%22%5D%7D%2C%22Action%22%3A%5B%22sts%3AAssumeRole%22%5D%7D%5D%7D</AssumeRolePolicyDocument>
-        <CreateDate>2012-05-09T15:45:45Z</CreateDate>
-        <RoleId>AROAC2ICXG32EXAMPLEWK</RoleId>
-      </member>
-    </Roles>
-  </ListRolesResult>
-  <ResponseMetadata>
-    <RequestId>20f7279f-99ee-11e1-a4c3-27EXAMPLE804</RequestId>
-  </ResponseMetadata>
-</ListRolesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.json
deleted file mode 100644
index db4949b815da..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{"IsTruncated": false,
- "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"},
- "ServerCertificateMetadataList": [
-     {"Arn": "arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert",
-      "Path": "/company/servercerts/",
-      "ServerCertificateId": "ASCACKCEVSQ6CEXAMPLE1",
-      "ServerCertificateName": "ProdServerCert",
-      "UploadDate": "2010-05-08T01:02:03.004Z"},
-     {"Arn": "arn:aws:iam::123456789012:server-certificate/company/servercerts/BetaServerCert",
-      "Path": "/company/servercerts/",
-      "ServerCertificateId": "ASCACKCEVSQ6CEXAMPLE2",
-      "ServerCertificateName": "BetaServerCert",
-      "UploadDate": "2010-05-08T02:03:01.004Z"},
-     {"Arn": "arn:aws:iam::123456789012:server-certificate/company/servercerts/TestServerCert",
-      "Path": "/company/servercerts/",
-      "ServerCertificateId": "ASCACKCEVSQ6CEXAMPLE3",
-      "ServerCertificateName": "TestServerCert",
-      "UploadDate": "2010-05-08T03:01:02.004Z"}
- ]
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.xml
deleted file mode 100644
index 141791ed45ef..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-server-certificates.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<ListServerCertificatesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListServerCertificatesResult>
-    <IsTruncated>false</IsTruncated>
-    <ServerCertificateMetadataList>
-      <member>
-        <ServerCertificateName>ProdServerCert</ServerCertificateName>
-        <Path>/company/servercerts/</Path>
-        <Arn>arn:aws:iam::123456789012:server-certificate/company/servercerts/ProdServerCert</Arn>
-        <UploadDate>2010-05-08T01:02:03.004Z</UploadDate>
-        <ServerCertificateId>ASCACKCEVSQ6CEXAMPLE1</ServerCertificateId>
-      </member>
-      <member>
-        <ServerCertificateName>BetaServerCert</ServerCertificateName>
-        <Path>/company/servercerts/</Path>
-        <Arn>arn:aws:iam::123456789012:server-certificate/company/servercerts/BetaServerCert</Arn>
-        <UploadDate>2010-05-08T02:03:01.004Z</UploadDate>
-        <ServerCertificateId>ASCACKCEVSQ6CEXAMPLE2</ServerCertificateId>
-      </member>
-      <member>
-        <ServerCertificateName>TestServerCert</ServerCertificateName>
-        <Path>/company/servercerts/</Path>
-        <Arn>arn:aws:iam::123456789012:server-certificate/company/servercerts/TestServerCert</Arn>
-        <UploadDate>2010-05-08T03:01:02.004Z</UploadDate>
-        <ServerCertificateId>ASCACKCEVSQ6CEXAMPLE3</ServerCertificateId>
-      </member>
-    </ServerCertificateMetadataList>
-  </ListServerCertificatesResult>
-  <ResponseMetadata>
-    <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-  </ResponseMetadata>
-</ListServerCertificatesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.json
deleted file mode 100644
index 86cfe3657159..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"Certificates": [
-    {"CertificateBody": "-----BEGIN CERTIFICATE-----\nMIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT\nAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT\nGEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy\nMDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw\nFQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf\nMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr\ndqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL\nywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf\nsuDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww\nCgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK\nCAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH\nwr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX\nwFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX\nAEaHzTpmEXAMPLE=\n-----END CERTIFICATE-----",
-     "CertificateId": "TA7SMP42TDN5Z26OBPJE7EXAMPLE",
-     "Status": "Active",
-     "UserName": "Bob"}],
- "IsTruncated": false,
- "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"}
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.xml
deleted file mode 100644
index ece537fd97f1..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-signing-certificates.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<ListSigningCertificatesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-   <ListSigningCertificatesResult>
-      <UserName>Bob</UserName>
-      <Certificates>
-         <member>
-            <UserName>Bob</UserName>
-            <CertificateId>TA7SMP42TDN5Z26OBPJE7EXAMPLE</CertificateId>
-            <CertificateBody>-----BEGIN CERTIFICATE-----
-MIICdzCCAeCgAwIBAgIGANc+Ha2wMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMQwwCgYDVQQLEwNBV1MxITAfBgNVBAMT
-GEFXUyBMaW1pdGVkLUFzc3VyYW5jZSBDQTAeFw0wOTAyMDQxNzE5MjdaFw0xMDAy
-MDQxNzE5MjdaMFIxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBbWF6b24uY29tMRcw
-FQYDVQQLEw5BV1MtRGV2ZWxvcGVyczEVMBMGA1UEAxMMNTdxNDl0c3ZwYjRtMIGf
-MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpB/vsOwmT/O0td1RqzKjttSBaPjbr
-dqwNe9BrOyB08fw2+Ch5oonZYXfGUrT6mkYXH5fQot9HvASrzAKHO596FdJA6DmL
-ywdWe1Oggk7zFSXO1Xv+3vPrJtaYxYo3eRIp7w80PMkiOv6M0XK8ubcTouODeJbf
-suDqcLnLDxwsvwIDAQABo1cwVTAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0lAQH/BAww
-CgYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULGNaBphBumaKbDRK
-CAi0mH8B3mowDQYJKoZIhvcNAQEFBQADgYEAuKxhkXaCLGcqDuweKtO/AEw9ZePH
-wr0XqsaIK2HZboqruebXEGsojK4Ks0WzwgrEynuHJwTn760xe39rSqXWIOGrOBaX
-wFpWHVjTFMKk+tSDG1lssLHyYWWdFFU4AnejRGORJYNaRHgVTKjHphc5jEhHm0BX
-AEaHzTpmEXAMPLE=
------END CERTIFICATE-----</CertificateBody>
-            <Status>Active</Status>
-         </member>
-      </Certificates>
-      <IsTruncated>false</IsTruncated>
-   </ListSigningCertificatesResult>
-   <ResponseMetadata>
-      <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-   </ResponseMetadata>
-</ListSigningCertificatesResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.json
deleted file mode 100644
index a8d9ff8d97ae..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "IsTruncated": false,
-    "ResponseMetadata": {"RequestId": "7a62c49f-347e-4fc4-9331-6e8eEXAMPLE"},
-    "Users": [
-	{"Arn": "arn:aws:iam::123456789012:user\n            /division_abc/subdivision_xyz/engineering/Andrew",
-         "Path": "/division_abc/subdivision_xyz/engineering/",
-         "UserId": "AID2MAB8DPLSRHEXAMPLE",
-         "UserName": "Andrew"},
-        {"Arn": "arn:aws:iam::123456789012:user\n            /division_abc/subdivision_xyz/engineering/Jackie",
-         "Path": "/division_abc/subdivision_xyz/engineering/",
-         "UserId": "AIDIODR4TAW7CSEXAMPLE",
-         "UserName": "Jackie"}
-    ]
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.xml
deleted file mode 100644
index 12cabe78149b..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-users.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<ListUsersResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-   <ListUsersResult>
-      <Users>
-         <member>
-            <Path>/division_abc/subdivision_xyz/engineering/</Path>
-            <UserName>Andrew</UserName>
-            <UserId>AID2MAB8DPLSRHEXAMPLE</UserId>
-            <Arn>arn:aws:iam::123456789012:user
-            /division_abc/subdivision_xyz/engineering/Andrew</Arn>
-         </member>
-         <member>
-            <Path>/division_abc/subdivision_xyz/engineering/</Path>
-            <UserName>Jackie</UserName>
-            <UserId>AIDIODR4TAW7CSEXAMPLE</UserId>
-            <Arn>arn:aws:iam::123456789012:user
-            /division_abc/subdivision_xyz/engineering/Jackie</Arn>
-         </member>
-      </Users>
-      <IsTruncated>false</IsTruncated>
-   </ListUsersResult>
-   <ResponseMetadata>
-      <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId>
-   </ResponseMetadata>
-</ListUsersResponse>
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.json b/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.json
deleted file mode 100644
index 21f92118a9cd..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{"IsTruncated": false,
- "ResponseMetadata": {"RequestId": "b61ce1b1-0401-11e1-b2f8-2dEXAMPLEbfc"},
- "VirtualMFADevices": [
-     {"SerialNumber": "arn:aws:iam::123456789012:mfa/MFAdeviceName"},
-     {"EnableDate": "2011-10-20T20:49:03Z",
-      "SerialNumber": "arn:aws:iam::123456789012:mfa/RootMFAdeviceName",
-      "User": {"Arn": "arn:aws:iam::123456789012:root",
-               "CreateDate": "2009-10-13T22:00:36Z",
-               "UserId": "123456789012"}},
-     {"EnableDate": "2011-10-31T20:45:02Z",
-      "SerialNumber": "arn:aws:iam:::mfa/ExampleUserMFAdeviceName",
-      "User": {"Arn": "arn:aws:iam::111122223333:user/ExampleUser",
-               "CreateDate": "2011-07-01T17:23:07Z",
-               "Path": "/",
-               "UserId": "AIDEXAMPLE4EXAMPLEXYZ",
-               "UserName": "ExampleUser"}
-     }
- ]
-}
diff --git a/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.xml b/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.xml
deleted file mode 100644
index c6ac63be7a10..000000000000
--- a/tests/unit/botocore/response_parsing/xml/responses/iam-list-virtual-mfa-devices.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<ListVirtualMFADevicesResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/">
-  <ListVirtualMFADevicesResult>
-    <IsTruncated>false</IsTruncated>
-    <VirtualMFADevices>
-      <member>
-        <SerialNumber>arn:aws:iam::123456789012:mfa/MFAdeviceName</SerialNumber>
-      </member>
-      <member>
-        <SerialNumber>arn:aws:iam::123456789012:mfa/RootMFAdeviceName</SerialNumber>
-        <EnableDate>2011-10-20T20:49:03Z</EnableDate>
-        <User>
-          <UserId>123456789012</UserId>
-          <Arn>arn:aws:iam::123456789012:root</Arn>
-          <CreateDate>2009-10-13T22:00:36Z</CreateDate>
-        </User>
-      </member>
-      <member>
-        <SerialNumber>arn:aws:iam:::mfa/ExampleUserMFAdeviceName</SerialNumber>
-        <EnableDate>2011-10-31T20:45:02Z</EnableDate>
-        <User>
-          <UserId>AIDEXAMPLE4EXAMPLEXYZ</UserId>
-          <Path>/</Path>
-          <UserName>ExampleUser</UserName>
-          <Arn>arn:aws:iam::111122223333:user/ExampleUser</Arn>
-          <CreateDate>2011-07-01T17:23:07Z</CreateDate>
-        </User>
-      </member>
-    </VirtualMFADevices>
-  </ListVirtualMFADevicesResult>
-  <ResponseMetadata>
-    <RequestId>b61ce1b1-0401-11e1-b2f8-2dEXAMPLEbfc</RequestId>
-  </ResponseMetadata>
-</ListVirtualMFADevicesResponse>