diff --git a/docs/erepublik.rst b/docs/erepublik.rst
index 7f14c3d..dd3ab8f 100644
--- a/docs/erepublik.rst
+++ b/docs/erepublik.rst
@@ -44,14 +44,6 @@ erepublik.utils module
    :undoc-members:
    :show-inheritance:
 
-erepublik.ws module
--------------------
-
-.. automodule:: erepublik.ws
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..efd78b0
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,16 @@
+-r requirements.txt
+-r requirements-tests.txt
+bump2version==1.0.1
+coverage==6.1.1
+edx-sphinx-theme==3.0.0
+flake8==4.0.1
+ipython>=7.29.0
+jedi!=0.18.0
+isort==5.9.3
+pre-commit==2.15.0
+pur==5.4.2
+responses==0.15.0
+Sphinx==4.2.0
+twine==3.4.2
+wheel==0.37.0
+black==21.7b0
diff --git a/requirements-tests.txt b/requirements-tests.txt
new file mode 100644
index 0000000..3c9aa28
--- /dev/null
+++ b/requirements-tests.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+pytest==6.2.5
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..d22f9de
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+PySocks==1.7.1
+pytz==2021.3
+requests==2.26.0
+requests-toolbelt==0.9.1
diff --git a/requirements_dev.txt b/requirements_dev.txt
deleted file mode 100644
index 53f7a21..0000000
--- a/requirements_dev.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-bump2version==1.0.1
-coverage==5.5
-edx-sphinx-theme==3.0.0
-flake8==3.9.2
-ipython>=7.26.0
-jedi!=0.18.0
-isort==5.9.3
-pip==21.2.4
-pre-commit==2.14.0
-pur==5.4.2
-PyInstaller==4.5.1
-PySocks==1.7.1
-pytest==6.2.4
-pytz==2021.1
-requests==2.26.0
-requests-toolbelt==0.9.1
-responses==0.13.4
-setuptools==57.4.0
-Sphinx==4.1.2
-twine==3.4.2
-wheel==0.37.0
-black==21.7b0
diff --git a/setup.py b/setup.py
index 953fd8f..0874b28 100644
--- a/setup.py
+++ b/setup.py
@@ -11,18 +11,15 @@ with open("README.rst") as readme_file:
 with open("HISTORY.rst") as history_file:
     history = history_file.read()
 
-requirements = [
-    "PySocks==1.7.1",
-    "pytz==2021.1",
-    "requests==2.26.0",
-    "requests-toolbelt==0.9.1",
-]
+with open("requirements.txt") as requirements_file:
+    requirements = requirements_file.read()
+    requirements = requirements.split()
 
 setup_requirements = []
 
-test_requirements = [
-    "pytest==6.2.4",
-]
+with open("requirements-tests.txt") as test_req_file:
+    test_requirements = test_req_file.read()
+    test_requirements = [line.strip() for line in test_requirements.split() if line.strip()[:2].strip() not in ("#", "-r")]
 
 setup(
     author="Eriks Karls",