diff --git a/.coveragerc b/.coveragerc
index 1ee9c2a..508bc65 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,4 +3,11 @@ omit =
     */wsgi.py
     setup.py
     manage.py
+    */config_utils/*
+    */navbars.py
     */migrations/*
+    */mommy_*
+    venv/*
+    runtests.py
+    .tox/*
+    .eggs/*
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 347835f..4ea6d64 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@
     zip_safe=False,
     keywords='django fields encryption security',
     install_requires=[
-        'pycrypto',
+        'pycryptodome',
     ],
     classifiers=[
         'Environment :: Web Environment',
diff --git a/tox.ini b/tox.ini
index 958424d..9b0ecc1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,7 @@
 [tox]
 envlist =
-    py36-django21
-    py36-djangotrunk
-    py37-django21
+    py37-django21,
     py37-djangotrunk
-    flake8
-
-
-[flake8]
-ignore = E41,F401,W503,F601,W605,E203
-max-complexity = 10
-max-line-length = 95
-exclude = django_crypto_fields/tests/*,django_crypto_fields/migrations/*,.venv/*
-
 
 [testenv:docs]
 changedir = docs
@@ -23,20 +12,18 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
-setenv =
-    PYTHONWARNINGS=module::DeprecationWarning
-commands =
-  flake8 django_crypto_fields
-  coverage run --source=django_crypto_fields setup.py test
-  coverage report
+setenv = PYTHONWARNINGS=module::DeprecationWarning
 deps =
-  # -rrequirements.txt
+  -rrequirements.txt
   coverage
   flake8
   django21: Django>=2.1,<2.2
   djangotrunk: https://github.com/django/django/tarball/master
+commands =
+  flake8 django_crypto_fields
+  coverage run setup.py test
+  coverage report
 
 [travis]
 python =
-  3.6: py36
   3.7: py37
\ No newline at end of file