diff --git a/tests/keystore/test_keystore.py b/tests/keystore/test_keystore.py
index e69de29bb..7d454c86c 100644
--- a/tests/keystore/test_keystore.py
+++ b/tests/keystore/test_keystore.py
@@ -0,0 +1,31 @@
+import unittest
+from nkms.keystore import keystore, keypairs
+
+
+class TestKeyStore(unittest.TestCase):
+    def setUp(self):
+        self.ks = keystore.KeyStore()
+
+    def test_ecies_keypair_generation(self):
+        keypair = self.ks.gen_ecies_keypair()
+        self.assertEqual(keypairs.EncryptingKeypair, type(keypair))
+        self.assertEqual(bytes, type(keypair.privkey))
+        self.assertEqual(bytes, type(keypair.pubkey))
+
+    def test_ecdsa_keypair_generation(self):
+        keypair = self.ks.gen_ecdsa_keypair()
+        self.assertEqual(keypairs.SigningKeypair, type(keypair))
+        self.assertEqual(bytes, type(keypair.privkey))
+        self.assertEqual(bytes, type(keypair.pubkey))
+
+    def test_get_key(self):
+        # TODO: Implement this.
+        pass
+
+    def test_add_key(self):
+        # TODO: Implement this.
+        pass
+
+    def test_del_key(self):
+        # TODO: Implement this.
+        pass