diff --git a/functional/tests/compute/__init__.py b/functional/tests/compute/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/functional/tests/compute/v2/__init__.py b/functional/tests/compute/v2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/functional/tests/compute/v2/test_keypair.py b/functional/tests/compute/v2/test_keypair.py
new file mode 100644
index 0000000000..0909c2d62f
--- /dev/null
+++ b/functional/tests/compute/v2/test_keypair.py
@@ -0,0 +1,44 @@
+#    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 uuid
+
+from functional.common import test
+
+
+class KeypairTests(test.TestCase):
+    """Functional tests for compute keypairs. """
+    NAME = uuid.uuid4().hex
+    HEADERS = ['Name']
+    FIELDS = ['deleted_at', 'name', 'updated_at']
+
+    @classmethod
+    def setUpClass(cls):
+        private_key = cls.openstack('keypair create ' + cls.NAME)
+        cls.assertInOutput('-----BEGIN RSA PRIVATE KEY-----', private_key)
+        cls.assertInOutput('-----END RSA PRIVATE KEY-----', private_key)
+
+    @classmethod
+    def tearDownClass(cls):
+        raw_output = cls.openstack('keypair delete ' + cls.NAME)
+        cls.assertOutput('', raw_output)
+
+    def test_keypair_list(self):
+        opts = self.get_list_opts(self.HEADERS)
+        raw_output = self.openstack('keypair list' + opts)
+        self.assertIn(self.NAME, raw_output)
+
+    def test_keypair_show(self):
+        opts = self.get_show_opts(self.FIELDS)
+        raw_output = self.openstack('keypair show ' + self.NAME + opts)
+        expected = "None\n" + self.NAME + "\nNone\n"
+        self.assertEqual(expected, raw_output)