diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..d3ee6a7ff
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,12 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+    -   id: check-toml
+    -   id: flake8
diff --git a/Pipfile b/Pipfile
index 6de850fe1..1c689656a 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,23 +4,28 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-"enum34" = "*"
-filelock = "*"
+PyYAML = ">=4.2b1"
 six = "*"
+filelock = "*"
 tabulate = "*"
-Fabric = "*"
-PyYAML = ">= 4.2b1"
+dill = "*"
 maestrowf = {path = "."}
 
 [dev-packages]
-"flake8" = "*"
+flake8 = "*"
 pydocstyle = "*"
 pylint = "*"
 tox = "*"
 coverage = "*"
-sphinx_rtd_theme = "*"
-Sphinx = "*"
 pytest = "*"
+fabric = "*"
+Sphinx = "*"
+pytest-cov = "*"
+pre-commit = "*"
+sphinx-rtd-theme = "*"
+
+[pipenv]
+allow_prereleases = true
 
 [requires]
 python_version = "3.6"
diff --git a/requirements.txt b/requirements.txt
index a6c9b459a..a641eab45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,19 @@
-fabric
-coverage
-filelock
 PyYAML>=4.2b1
 six
+filelock
+tabulate
+enum34; python_version<'3.4'
+dill
+-e .
+
+fabric
+coverage
 sphinx_rtd_theme
 sphinx
 flake8
 pydocstyle
 pylint
 tox
-tabulate
 pytest
-enum34; python_version<'3.4'
-dill
+pytest-cov
+pre-commit