diff --git a/flake8 b/flake8
deleted file mode 100644
index 401fdf4..0000000
--- a/flake8
+++ /dev/null
@@ -1,4 +0,0 @@
-[flake8]
-max-line-length = 120
-exclude = docs/*,demo/*
-ignore = F403
\ No newline at end of file
diff --git a/.coveragerc b/setup.cfg
similarity index 77%
rename from .coveragerc
rename to setup.cfg
index 70d6d0d..3ba7986 100644
--- a/.coveragerc
+++ b/setup.cfg
@@ -1,8 +1,13 @@
-# .coveragerc to control coverage.py
-[run]
+[flake8]
+max-line-length = 120
+exclude = docs/*,demo/*
+ignore = F403
+
+
+[coverage:run]
 omit=*site-packages*,*distutils*,*migrations*
 
-[report]
+[coverage:report]
 # Regexes for lines to exclude from consideration
 exclude_lines =
     # Have to re-enable the standard pragma
@@ -22,5 +27,5 @@ exclude_lines =
 
 ignore_errors = True
 
-[html]
-directory = coverage_html
\ No newline at end of file
+[coverage:html]
+directory = coverage_html