diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1459b3eeb5a80c592c43818ff6f542344d3204cb..87ced90054baac442d5a2910f53f79d5f2569443 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,7 +47,7 @@ jobs:
           name: run tests
           command: |
             ./cc-test-reporter before-build
-            tox -e py36,pylint
+            tox -e py36
             ./cc-test-reporter after-build --exit-code $?
 
       - deploy:
diff --git a/beem/wallet.py b/beem/wallet.py
index 12dc1aeb10b6e12e32572020564aa4bd660d863f..053cb8c5fd107d7b524e04c30a61e794101d6774 100644
--- a/beem/wallet.py
+++ b/beem/wallet.py
@@ -262,7 +262,7 @@ class Wallet(object):
             # Try to decode as wif
             PrivateKey(encwif, prefix=self.prefix)
             return encwif
-        except ValueError:
+        except (ValueError, AssertionError):
             pass
         if self.locked():
             raise AssertionError()
diff --git a/tox.ini b/tox.ini
index 26a58c70d4167c9ae430a65cb31f5d206831160a..cfe93926665216bf6ee090cfe962957438098a2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,17 @@
 [tox]
-envlist = py{27,34,35,36,37},lint,pyflakes
+envlist = py{27,34,35,36,37}
 skip_missing_interpreters = true
 
 [testenv]
+deps =
+    mock>=2.0.0
+    pytest
+    pytest-mock
+    parameterized
+commands =
+    pytest
+
+[testenv:py36]
 deps =
     mock>=2.0.0
     pytest