diff --git a/tempest/api_schema/response/compute/v2_1/migrations.py b/tempest/api_schema/response/compute/v2_1/migrations.py
deleted file mode 100644
index b7d66ea..0000000
--- a/tempest/api_schema/response/compute/v2_1/migrations.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2014 NEC Corporation.  All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-list_migrations = {
-    'status_code': [200],
-    'response_body': {
-        'type': 'object',
-        'properties': {
-            'migrations': {
-                'type': 'array',
-                'items': {
-                    'type': 'object',
-                    'properties': {
-                        'id': {'type': 'integer'},
-                        'status': {'type': ['string', 'null']},
-                        'instance_uuid': {'type': ['string', 'null']},
-                        'source_node': {'type': ['string', 'null']},
-                        'source_compute': {'type': ['string', 'null']},
-                        'dest_node': {'type': ['string', 'null']},
-                        'dest_compute': {'type': ['string', 'null']},
-                        'dest_host': {'type': ['string', 'null']},
-                        'old_instance_type_id': {'type': ['integer', 'null']},
-                        'new_instance_type_id': {'type': ['integer', 'null']},
-                        'created_at': {'type': 'string'},
-                        'updated_at': {'type': ['string', 'null']}
-                    },
-                    'additionalProperties': False,
-                    'required': [
-                        'id', 'status', 'instance_uuid', 'source_node',
-                        'source_compute', 'dest_node', 'dest_compute',
-                        'dest_host', 'old_instance_type_id',
-                        'new_instance_type_id', 'created_at', 'updated_at'
-                    ]
-                }
-            }
-        },
-        'additionalProperties': False,
-        'required': ['migrations']
-    }
-}
diff --git a/tempest/clients.py b/tempest/clients.py
index fa5edbf..f3cfe86 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -39,6 +39,7 @@
 from tempest_lib.services.compute.instance_usage_audit_log_client import \
     InstanceUsagesAuditLogClient
 from tempest_lib.services.compute.limits_client import LimitsClient
+from tempest_lib.services.compute.migrations_client import MigrationsClient
 from tempest_lib.services.identity.v2.token_client import TokenClient
 from tempest_lib.services.identity.v3.token_client import V3TokenClient
 
@@ -54,8 +55,6 @@
 from tempest.services.compute.json.interfaces_client import \
     InterfacesClient
 from tempest.services.compute.json.keypairs_client import KeyPairsClient
-from tempest.services.compute.json.migrations_client import \
-    MigrationsClient
 from tempest.services.compute.json.networks_client import NetworksClient \
     as ComputeNetworksClient
 from tempest.services.compute.json.quota_classes_client import \
diff --git a/tempest/services/compute/json/migrations_client.py b/tempest/services/compute/json/migrations_client.py
deleted file mode 100644
index b302539..0000000
--- a/tempest/services/compute/json/migrations_client.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2014 NEC Corporation.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_serialization import jsonutils as json
-from six.moves.urllib import parse as urllib
-
-from tempest.api_schema.response.compute.v2_1 import migrations as schema
-from tempest.common import service_client
-
-
-class MigrationsClient(service_client.ServiceClient):
-
-    def list_migrations(self, **params):
-        """Lists all migrations."""
-
-        url = 'os-migrations'
-        if params:
-            url += '?%s' % urllib.urlencode(params)
-
-        resp, body = self.get(url)
-        body = json.loads(body)
-        self.validate_response(schema.list_migrations, resp, body)
-        return service_client.ResponseBody(resp, body)
diff --git a/tempest/tests/services/compute/test_migrations_client.py b/tempest/tests/services/compute/test_migrations_client.py
deleted file mode 100644
index 55f2ef2..0000000
--- a/tempest/tests/services/compute/test_migrations_client.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2015 NEC Corporation.  All rights reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from tempest_lib.tests import fake_auth_provider
-
-from tempest.services.compute.json import migrations_client
-from tempest.tests.services.compute import base
-
-
-class TestMigrationsClient(base.BaseComputeServiceTest):
-    FAKE_MIGRATION_INFO = {"migrations": [{
-        "created_at": "2012-10-29T13:42:02",
-        "dest_compute": "compute2",
-        "dest_host": "1.2.3.4",
-        "dest_node": "node2",
-        "id": 1234,
-        "instance_uuid": "e9e4fdd7-f956-44ff-bfeb-d654a96ab3a2",
-        "new_instance_type_id": 2,
-        "old_instance_type_id": 1,
-        "source_compute": "compute1",
-        "source_node": "node1",
-        "status": "finished",
-        "updated_at": "2012-10-29T13:42:02"}]}
-
-    def setUp(self):
-        super(TestMigrationsClient, self).setUp()
-        fake_auth = fake_auth_provider.FakeAuthProvider()
-        self.mg_client_obj = migrations_client.MigrationsClient(
-            fake_auth, 'compute', 'regionOne')
-
-    def _test_list_migrations(self, bytes_body=False):
-        self.check_service_client_function(
-            self.mg_client_obj.list_migrations,
-            'tempest.common.service_client.ServiceClient.get',
-            self.FAKE_MIGRATION_INFO,
-            bytes_body)
-
-    def test_list_migration_with_str_body(self):
-        self._test_list_migrations()
-
-    def test_list_migration_with_bytes_body(self):
-        self._test_list_migrations(True)
