diff --git a/beem/cli.py b/beem/cli.py
index 043d390e072cf1e725b91e47203656a30d882292..e929023c1f26d95302a05e681f23007aea86a38b 100644
--- a/beem/cli.py
+++ b/beem/cli.py
@@ -223,7 +223,7 @@ def parsewif(unsafe_import_key):
     else:
         while True:
             wifkey = click.prompt("Enter private key", confirmation_prompt=False, hide_input=True)
-            if not wifkey:
+            if not wifkey or wifkey == "quit" or wifkey == "exit":
                 break
             try:
                 print(PrivateKey(wifkey, prefix=stm.prefix).pubkey)
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index d4e9cc0f78ec4904623db438279e83d24e650d5a..30b9a59488db36a95f4b45dea098e8cd04ef60c3 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -63,7 +63,7 @@ class Testcases(unittest.TestCase):
 
     def test_parsewif(self):
         runner = CliRunner()
-        result = runner.invoke(cli, ['parsewif'], input=wif + "\n")
+        result = runner.invoke(cli, ['parsewif'], input=wif + "\nexit\n")
         self.assertEqual(result.exit_code, 0)
         result = runner.invoke(cli, ['parsewif', '--unsafe-import-key ' + wif])
         self.assertEqual(result.exit_code, 0)
diff --git a/tox.ini b/tox.ini
index 228723d40db5a08786514a77ddbb277e42828b98..1443515456e3973afbaf783548559ac04416d00a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ deps =
     pytest-mock
     parameterized
     coverage
+    pytest-cov
     cryptography
     secp256k1
     scrypt