diff --git a/keystoneclient/tests/functional/base.py b/keystoneclient/tests/functional/base.py
index 743cb5019..a8a12e01e 100644
--- a/keystoneclient/tests/functional/base.py
+++ b/keystoneclient/tests/functional/base.py
@@ -83,7 +83,3 @@ class ClientTestCase(testtools.TestCase):
 
 class V3ClientTestCase(ClientTestCase):
     version = '3'
-
-
-class V2ClientTestCase(ClientTestCase):
-    version = '2.0'
diff --git a/keystoneclient/tests/functional/test_access.py b/keystoneclient/tests/functional/test_access.py
deleted file mode 100644
index 0b202fb63..000000000
--- a/keystoneclient/tests/functional/test_access.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.
-
-import os
-
-import testtools
-
-from keystoneclient.auth.identity import v2
-from keystoneclient import session
-from tempest.lib import base
-
-
-class TestV2AccessInfo(base.BaseTestCase):
-
-    def setUp(self):
-        super(TestV2AccessInfo, self).setUp()
-
-        self.session = session.Session()
-
-    @testtools.skip("likely race condition, being skipped")
-    def test_access_audit_id(self):
-        unscoped_plugin = v2.Password(auth_url=os.environ.get('OS_AUTH_URL'),
-                                      username=os.environ.get('OS_USERNAME'),
-                                      password=os.environ.get('OS_PASSWORD'))
-
-        unscoped_auth_ref = unscoped_plugin.get_access(self.session)
-
-        self.assertIsNotNone(unscoped_auth_ref.audit_id)
-        self.assertIsNone(unscoped_auth_ref.audit_chain_id)
-
-        scoped_plugin = v2.Token(auth_url=os.environ.get('OS_AUTH_URL'),
-                                 token=unscoped_auth_ref.auth_token,
-                                 tenant_name=os.environ.get('OS_TENANT_NAME'))
-
-        scoped_auth_ref = scoped_plugin.get_access(self.session)
-
-        self.assertIsNotNone(scoped_auth_ref.audit_id)
-        self.assertIsNotNone(scoped_auth_ref.audit_chain_id)
-
-        self.assertEqual(unscoped_auth_ref.audit_id,
-                         scoped_auth_ref.audit_chain_id)
diff --git a/keystoneclient/tests/functional/test_base.py b/keystoneclient/tests/functional/test_base.py
index d5f051663..091fc77d4 100644
--- a/keystoneclient/tests/functional/test_base.py
+++ b/keystoneclient/tests/functional/test_base.py
@@ -19,10 +19,3 @@ class V3ClientVersionTestCase(base.V3ClientTestCase):
     def test_version(self):
         self.assertIsInstance(self.client,
                               keystoneclient.v3.client.Client)
-
-
-class V2ClientVersionTestCase(base.V2ClientTestCase):
-
-    def test_version(self):
-        self.assertIsInstance(self.client,
-                              keystoneclient.v2_0.client.Client)
diff --git a/keystoneclient/tests/functional/v2_0/__init__.py b/keystoneclient/tests/functional/v2_0/__init__.py
deleted file mode 100644
index e69de29bb..000000000